Merge branch 'master' into vxlan-doc

Conflicts:
	client/WEB-INF/classes/resources/messages_ja.properties
	client/WEB-INF/classes/resources/messages_zh_CN.properties
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
	plugins/network-elements/vxlan/pom.xml
	plugins/network-elements/vxlan/src/com/cloud/network/guru/VxlanGuestNetworkGuru.java
	plugins/network-elements/vxlan/test/com/cloud/network/guru/VxlanGuestNetworkGuruTest.java
	scripts/vm/network/vnet/modifyvxlan.sh
	server/src/com/cloud/network/NetworkServiceImpl.java
	ui/scripts/sharedFunctions.js