Introduce POM dependency on VSphere 5.1 SDK, not done yet, WIP.
Merge branch 'master' into vim51_win8
Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new
wrapper class VmwareClient.
Merge branch 'master' into vim51_win8

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	pom.xml

Signed-off-by: Min Chen <min.chen@citrix.com>
Merge branch 'master' into vim51_win8
Fix cast error from List<?> to array.
Merge branch 'master' into vim51_win8

Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java

Signed-off-by: Min Chen <min.chen@citrix.com>
Fix a bug in converting Enum type to String.
Fix ClassCastException.
Merge branch 'master' into vim51_win8
Fix a bug in register template, cannot find template adapter.
Add new windows 8 guest os entries to DB.
add missing file, fix build
Removed a bunch of missing files and useless imports
Summary: KVM - Fix physical net parsing when traffic label points to tagged dev

Detail: If your traffic label points to a bridge that is on a tagged interface
rather than a real physical interface, cloudstack may not parse the physical
interface correctly, bringing up tagged interfaces on the tagged interface.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1360798665 -0700
CLOUDSTACK-1134: [EC2 Query API] DescribeSnapshots, 'n' ListVolumes get fired on CS for displaying 'n' Snapshots taken from the same Volume

For snapshots taken from the same volume re-use the response obtained by calling listVolumes
CS648 ckeck in missing VO file
dev guide updates for 4.1

Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
Persistent Networks documentation:Reviewed-By: Jessica Tomechak and Likitha Shetty
Docs: Fixed typo in nicira plugin guide