AWS Support
BOSH errand to register broker
Merge branch 'master' into aws_and_errand
Fix integration test to work with ssl
Fix spiff merge on properties.cf