Reverted to update 21 xml and changelog as could not get such a huge update to work.