Russian-Ukrainian prisoner swap to happen by the end of the year