Rebels and Ukraine government swap prisoners under new deal