Merge pull request #1918 from rperryman/master

Update to Network JSON examples for Openstack
Updated to support the nova-fixed vlan and os_sdn