BZ-99999: fix bad merge
BZ-12815: changes to save pop up changes when the estimate already exists
BZ-12812 'Save Settings' button issues that are related to the Branding Settings page. (active/inactive states)
Merge branch 'Sprint74-DV' into integration