Merge "Remove plain OpenStack pwd from Heat"