[BISERVER-11745] Editing a blockout does not preserve the duration

Cherry pick from master