CFY-1661
Merge remote-tracking branch 'origin/master'

Conflicts:
	softlayer_plugin/tests/test_plugin.py
Merge remote-tracking branch 'origin/master'