Revert "   CLOUDSTACK-737,"

This reverts commit 95aef332cc851f91bafb9af7bf5f0f682bb566ce.
Revert "CLOUDSTACK-737"

This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
Revert "CLOUDSTACK-737"

This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
Revert "CLOUDSTACK-737"

This reverts commit d7201dfe1f49fb75054e1f0b6922ed21446ad130.

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
Revert " CLOUDSTACK-737"

This reverts commit 65210f4e7ee62b237ccdd8d853553e7c990f19c8.

Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
Revert "CLOUDSTACK-737"

This reverts commit 8a86d08fe307719e50d28d61d8e9025e56ab27da.