Refactored NSIv2 reservation creation code to make it easier to
support E-NNI end points.
Allow E-NNI end points with NSIv2. Ensure VLAN id is correct when
required.