CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
private
(cherry picked from commit 018b471ad300ea0987e52d6b42dde71387de8c5b)
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
(cherry picked from commit 3268f5bd1f2175ccd919ee7195d69b05d5b3f3e2)

Conflicts:
	utils/test/com/cloud/utils/net/NetUtilsTest.java
CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
(cherry picked from commit 17850c7aff432a504d65a34d2f22ca7e1952a770)

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java