Commit includes:

Commit includes:
1> NeutronVPN support for floating IPs associaton to fixed IPs

    a. Extra dependency in fibmanager-shell bundle on fibmanager-impl also
       removed.
    b. Changes to FloatingIpInfo yang model to take router input as string
       rather than uint32.
    c. Resolved conflicts for the above.

2> Karaf CLI for DHCPService

3> Check for vlan/gre network provider in neutronvpn

4> SNAT : Fixed the neutron code to update the IPv4address in External
   Router model

Signed-off-by: Suraj Ranjan <suraj.ranjan@ericsson.com>
Change-Id: Ib8d2453ba5e96e1452cfbdc613834983d3912c0d