CLOUDSTACK-3139 - If management server doesn't have internet connection RegisterTemplate and UploadVolume will fail when CS tries to verify if the account has exceeded its secondary storage limit.
No change in behavior if management server has internet connection.
Now if management server doesn't have internet connection download process will not fail. But CS will noly check if the account has already reached or maxed its limits instead of checking if the limit will be breached with the addition of the new storage
CLOUDSTACK-3168: Fix test_reboot_router.py to ssh using public IP

test_reboot_router.py was trying to ssh to vm using private IP
and hence it failed with error "No route to host."
Fixed the testcase to ssh using public IP.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
CLOUDSTACK-3902: createVpcOffering - throw an excpetion when sourceNat service is not passed in
[GSOC] Mesos integration mid-term report

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
Summary: Fix null pointer and op_networks blocker to account cleanup

Detail: Accounts can fail in cleanup/gc process due to inconsistent op_networks
table and null pointer in looking up account for event publishing.

BUG-ID: CLOUDSTACK-3957
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1375204815 -0600
CLOUDSTACK-3936: db upgrade - added upgrade path from CCP 2.2.15,2.2.16 to CS 4.2
CLOUDSTACK-2990: UI > scale up VM dialog - add description 'For VMware-based Linux VMs, please read the dynamic scaling section in the admin guide before scaling.'
CloudStack CLOUDSTACK-1812
create physical network fails while creating basic zone
CLOUDSTACK-3531: Add isrouting checkbox to register template dialog
CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command
Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command"

This reverts commit 416331ae800a4511913f2c2b8ef25d4c2b8606b0.
CLOUDSTACK-3487: Add egress default policy to network offering UI
CLOUDSTACK-2569: UI > Infrastructure menu - zone detail - Cisco VNMC - apply action filter.
CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command
Fixed the build: use CallerContext instead of UserContext
Revert "Updating conversion pattern strings from 1. to 1"
The actual fix was already put in.

This reverts commit 4c729e758b935d58a8e93027c604e6353ad05ff2.
Added commons io to runtime
Added commons io to server
CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead
of at AttachVolumeCmd.