Add tests for openstack release setting, minor cleanup for install_type switch.
Fix merge conflicts
Add comment (tribaal's review)
Merge pull request #231 from sparkiegeek/openstack-rel-tests

Add tests for openstack release setting, cleanup for install_type switch [r=chrisglass]