Merge remote-tracking branch 'upstream/master'

Conflicts:
	cloudify-widget-hpcloud/src/main/java/cloudify/widget/hpcloud/NovaCloudCredentials.java