[Jason Guiditta]

Once we get these pushed to master, we can then point conductor at
:git version until we get another bugfix release of aeolus-image out.
This should fix at least a couple more tests due to the fixes jstransk
recently added to aeolus-image.

-j