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

Incorporating Openstack review comments
fixes from Openstack review comments and tempest tests
Merge pull request #37 from Juniper/praneetb_plugin_sync

fixes from Openstack review comments and tempest tests
Merge remote-tracking branch 'upstream/master'