imports
Merge branch 'master' of github.com:jacobwagner/rpcsqa

Conflicts:
	jenkins/modules/bare-metal/chef_helper.py
merge blank line
Merge branch 'master' of github.com:jacobwagner/rpcsqa