shixiong/okd @ d4658ec2e5004ff62051bc0ab8c88475237f543b

Jason DeTiberus ecb5264b00 Bugfixes for openshift-common related changes		10 lat temu
..
aws	ecb5264b00 Bugfixes for openshift-common related changes	10 lat temu
gce	ecb5264b00 Bugfixes for openshift-common related changes	10 lat temu