ServiceProxies uses InternalConfigurationService back by default
Merge branch 'master' into less_expensive_getObjectInfo