A collection of small changes to improve usability

This addresses some related issues raised here:
https://etherpad.openstack.org/p/heat-useablity-improvements

Change-Id: I4abd4f917a712ee73404fb4366eeed20fba55f3f
Merge "A collection of small changes to improve usability"