Fix Spring collision of beans implementing NetworkHelper
Merge branch 'cmd-visitor' of github.com:schubergphilis/CloudStack into cmd-visitor

Conflicts:
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java