Incorporating Openstack review comments
Merge pull request #36 from Juniper/rrugge-master

Incorporating Openstack review comments