Added fix for CLOUDSTACK-6548

Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Signed-off-by: Daan Hoogland <daan@onecht.net>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
be able to remove vpc as owning entity of a network