Fixing nonPFS heat "Invalid Openstack credentials" issue.

Set of minor fixes for nonPFS Heat, to deploy and work correctly.