work around nova.conf subscription issues
fix foodcritic violations
fix more foodcritic violations
Merge pull request #290 from rackerjoe/work_around_nova_conf_subscribe_issues_in_folsom

work around nova.conf subscription issues