A promise of more social and affordable homes and a 'one move' pledge to residents has been secured in negotiations between the council and Berkeley Homes