BZ-12492 fixed minot issues.
Merge commit '2f1d8edcb8cf66debcc5e33dcd0cc25c2dd49948' into integration

Conflicts:
	src/main/js/noesis/bootstrap/savingsEstimator/directives/estimatePreview.js