CLOUDSTACK-427: More cleanup of hardcoded references. This is probably all for this pass on 4.1