Support more user variables in the OpenStack builder
Merge pull request #1098 from priteau/openstack-user-variables

builder/openstack: Support more user variables in the OpenStack builder