Revert "CLOUDSTACK-5979 vlan parsing fixed"

This reverts commit caf17c2f46bf317ec8966b08aaff728a73fda14a.
check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit
6d0dbf59683e1878533c8c985f26f18a1d69e1c1)

Conflicts:
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java