This reverts commit 447430c3df. Conflicts: api/src/org/apache/cloudstack/api/BaseCmd.java server/src/com/cloud/api/ApiDispatcher.java server/src/com/cloud/network/as/AutoScaleManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
447430c3df