Fix bug on get_password for "heat"

- Add appropriate variables for "get_password" call for heat db.
- Fix stub in spec test to catch this in future.

Change-Id: Ic653dde525bbe7c56e8cf1a6694a06885a1e3c88
Remove Berksfile.lock from dev branches

blueprint remove-berksfile-lock-from-dev-branches

Change-Id: I16763286632d468f3dbea28750b9ecfee75533cf
Merge "Remove Berksfile.lock from dev branches"