would be nice to not deviate from Cloud:OpenStack:Icehouse by doing extra stuff in D:C:4:Staging