BZ-8805: fix up controller placements on the modals so we can use form
validation properly. This is a prescribed workaround on the ui-bootstrap
forum.
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap.git