[30/32] pulled from master

[ahuang]

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1294cdc7/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/network/element/VirtualRouterElement.java
index 4818443,823b74f..b25d4c4
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@@ -23,8 -23,8 +23,9 @@@ import java.util.Map
  import java.util.Set;
  
  import javax.ejb.Local;
 +import javax.inject.Inject;
  
+ import com.cloud.utils.PropertiesUtil;
  import 
org.apache.cloudstack.api.command.admin.router.ConfigureVirtualRouterElementCmd;
  import 
org.apache.cloudstack.api.command.admin.router.ListVirtualRouterElementsCmd;
  import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1294cdc7/server/src/com/cloud/server/ManagementServerExtImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/server/ManagementServerExtImpl.java
index 03e50eb,8a59d2f..3106985
--- a/server/src/com/cloud/server/ManagementServerExtImpl.java
+++ b/server/src/com/cloud/server/ManagementServerExtImpl.java
@@@ -32,9 -29,8 +32,10 @@@ import com.cloud.domain.dao.DomainDao
  import com.cloud.exception.InvalidParameterValueException;
  import com.cloud.exception.PermissionDeniedException;
  import com.cloud.projects.Project;
+ import com.cloud.utils.PropertiesUtil;
  import org.apache.cloudstack.api.response.UsageTypeResponse;
 +import org.springframework.stereotype.Component;
 +
  import com.cloud.usage.UsageJobVO;
  import com.cloud.usage.UsageTypes;
  import com.cloud.usage.UsageVO;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1294cdc7/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/server/ManagementServerImpl.java
index 60bab00,79ad759..d8525d6
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@@ -223,11 -223,11 +223,12 @@@ import com.cloud.utils.EnumUtils
  import com.cloud.utils.NumbersUtil;
  import com.cloud.utils.Pair;
  import com.cloud.utils.PasswordGenerator;
+ import com.cloud.utils.PropertiesUtil;
  import com.cloud.utils.Ternary;
 -import com.cloud.utils.component.Adapters;
 -import com.cloud.utils.component.ComponentLocator;
 -import com.cloud.utils.component.Inject;
 +import com.cloud.utils.component.Adapter;
 +import com.cloud.utils.component.ComponentContext;
 +import com.cloud.utils.component.Manager;
 +import com.cloud.utils.component.SystemIntegrityChecker;
  import com.cloud.utils.concurrency.NamedThreadFactory;
  import com.cloud.utils.crypt.DBEncryptionUtil;
  import com.cloud.utils.db.DB;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1294cdc7/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/user/AccountManagerImpl.java
index dc0370b,b910a03..cf8602c
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@@ -38,16 -37,14 +38,17 @@@ import javax.inject.Inject
  import javax.naming.ConfigurationException;
  
  import org.apache.cloudstack.acl.ControlledEntity;
+ import org.apache.cloudstack.acl.RoleType;
  import org.apache.cloudstack.acl.SecurityChecker;
 +import org.apache.cloudstack.acl.SecurityChecker.AccessType;
  import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
 +import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
  import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
 +import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
  import org.apache.commons.codec.binary.Base64;
  import org.apache.log4j.Logger;
 +import org.springframework.stereotype.Component;
  
 -import org.apache.cloudstack.acl.SecurityChecker.AccessType;
  import com.cloud.api.ApiDBUtils;
  import com.cloud.api.query.dao.UserAccountJoinDao;
  import com.cloud.api.query.vo.ControlledViewEntity;