Merge proposals dependent on lp:~free.ekanayaka/landscape-charm/bootstrap-action-returns-api-creds

1. bootstrap-action-returns-api-creds
2. Dependent merge proposals