Add vlan support in juju-bootstrap node
Merge branch 'master' into vlan-juju-1.20

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

Conflicts:
	debian/control
Merge branch 'vlan-juju-1.20'