Merge pull request #133 from EricWittmann/master

fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1057210
Merge pull request #134 from EricWittmann/master

Changes due to overlord commons improvements