Revert "CLOUDSTACK-7124: Fix unit test"

This reverts commit ef28fd36727bfffbbcb7f2fc120139b7c7d39eb2.

Fix of CLOUDSTACK-7124 caused CLOUDSTACK-7163.
Revert "CLOUDSTACK-7124: Fix semicolon caused VPN programming issue"

This reverts commit 809b47e4eb2a99248ad122499e288610a5cd12ad.

Because the fix cause CLOUDSTACK-7163. Would fix it in another way.

Conflicts:
	core/src/com/cloud/agent/resource/virtualnetwork/ConfigHelper.java