BZ-12231: Changes to preserve the original setting info if the user cancel or close the modal
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap