Finish image buildout

Podhorszki, Norbertrequested to merge
github/fork/scottwittenburg/finish-image-buildout into master

Created by: scottwittenburg

Merge request reports