CLOUDSTACK-4784: 22x to 4.x upgrade - don't ignore redundant router network offering, when update ntwk_offering_serivce_map with PF/StaticNat/SourceNat services
Add Manage Context framework

The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
CLOUDSTACK-4785:
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
CLOUDSTACK-4785:
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
=Comment the test for now to unblock everyone. Will file a bug and fix it
CLOUDSTACK-4790: Skip reserved VMware scsi device number for SCSI disks
Temporary fix for the chicken and egg problem when making changes to the configuration database.
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Have added a test for transferring portable ip across different works with in the same zone.
(cherry picked from commit 32cdffdd629134864220fbc400d3d28f0e6549c2)
Merge branch 'master' into ui-restyle