CLOUDSTACK-2921: Added more logging to attach failure

Also reduced size of attached disk to 1GB

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit ba059dd0ae09f6f7854aef5d14cccb9ce948724b)
CLOUDSTACK-4015: don't insert the fake template record when upgrade from 304 to 305
CLOUDSTACK-3344: UI > util > _s() should not include ampersand.
CLOUDSTACK-3344: revert e03f7f4db3c23eb5e4b72e62aa8fefd54f1c2355
- CLOUSTACK-3229: Properly converts the Content-Length to string
  representation in s3xen
CLOUDSTACK-4008: return virtual size of volume in KVM
Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
CLOUDSTACK-3713: UI > Infrastructure menu > System VMs > Scale Up action: call scaleSystemVm API instead of scaleVirtualMachine API.
CLOUDSTACK-4008: fix snapshot npe if its volume is deleted
CloudStack CLOUDSTACK-3986
baremetal - create basic zone for baremetal fail - Dhcp service provider for this network does not support the dhcp across multiple subnets
CLOUDSTACK-4017:
 try to remove VDI host lock before start the VM which is using this VDI
CLOUDSTACK-3753: UI > Infrastructure > zone detail > physical network > guest > (1) remove Delete VLAN Range action. (2) change Add VLAN Range action to pass new VLAN range + exisitng VLAN range(s) to API. This is corresponding UI change to updatePhysicalNetwork API change that removevlan property has been removed and definition of vlan property has been changed.
CLOUDSTACK-3753: UI > Infrastructure > zone > physical network > Guest > Edit action - make VLAN Range(s) editable. This is corresponding UI change to recent change of updatePhysicalNetwork API.
CLOUDSTACK-4020: lock nic entry in releaseNic method. Otherwise multiple threads can try to release the same nic at the same time, and it will lead to NPEs and backend failures

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
CLOUDSTACK-3753: UI > Infrastructure > zone > physical network > Guest > remove Add VLAN Range action since VLAN Range(s) is editable through Edit action.
CLOUDSTACK-4002: [Upgrade][2.2.16 to 4.2] After upgrade creation of
volume from a snapshot which was existing before upgrade, fails with NPE
CLOUDSTACK-3759 [Automation] Failed to attach volume to VM, while vm are in stopped state Fix the null pointer.

Signed-off-by: Edison Su <sudison@gmail.com>
Automation: Reconnect the ssh for test_vpc_vm_life_cycle.py

Since VM are reused for test cases, we need to reconnect the SSH client to avoid
error like:

Failed to SSH into VM, SSH session not active
Automation: fixed cleanup issue with test_vpn_user.

Reviewed-by: Sheng Yang <sheng.yang@citrix.com>
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
Automation: More fix fox test_vpc_vm_life_cycle.py

You cannot reach VPC router IP because you're in one of it's networks.

As well as adding missing import for test_vpc_network_pfrules.py