CLOUDSTACK-485: cloudstack UI - zone wizard - Hide Guest Traffic Step(VLAN Range field) when Advanced/SecurityGroup is selected. Show it when Advanced/VLAN is selected.
Fixed listNetworks for the case when a) caller is an admin 2) projectId=-1 is specified - admin wasn't able to list networks belonging to regular users' projects
DeployVm: when SG enabled network is passed to the command, but no SG list is defined in the request, add the vm to SG enabled network automatically

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
Fixed json response to return "size" parameter (resources count in the system) when pageSize=0 is specified
add storage motion interface
Connnect event bus to messaging layer
Upgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message: Hence correcting the error message
cli: Split using only space

Patch fixes lexical parser for default argument on shell.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
CLOUDSTACK-424: Update userdata should propagate to VR

The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.

The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.

For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data

This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.

[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/

BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
cli: Handle HTTP and URL errors

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
Zone wizard UI: Change isolation mode selection

-Remove VLAN + SG radio buttons; replace with 'Security groups'
checkbox

-Pass boolean 'zone.sgEnabled' to zoneWizard action handler, instead of
'zone.isolationMode' from before.
Instance wizard UI: Support conditional hide/show of add network box

Adds new function 'showAddNetwork' to instance wizard configuration,
which conditionally hides the 'add network form' on the select network
step. If it returns true, then show the box, otherwise false hides it.
fix build
CLOUDSTACK-495: cloudstack UI - template page - delete template/ISO - fix a JS error "cloudStack.context.projects is null"
CLOUDSTACK-496: cloudstack UI - zone wizard - replace Isolation mode VLAN/SecurityGroup radio buttons with one single checkbox SecurityGroup.
Add concept of caller context and message serilizer to messaging layer
Add pipeline concept to RPC facility, fix javelin build issue
add image motion interface
AutoScale changes in Apache master
AutoScale. Adding default counters

Conflicts:

	server/src/com/cloud/server/ConfigurationServerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-304to305.sql