BZ-12815: changes to save pop up changes when the estimate already exists