jichenjc: Backport changes from master to release-0.1

JobBuild
447
08-18 09:58
pull-cluster-api-provider-openstack-make 1163027462699880451
pull-cluster-api-provider-openstack-test 1163027462704074752