This reverts commit d6ed8d7cb5. Conflicts: server/test/com/cloud/configuration/ConfigurationManagerTest.java
d6ed8d7cb5