ibm smart cloud update
Merge branch 'update/060-fixes-AH' into update/brooklyn-060-SNAPSHOT