merge RobertCNelson/omap-image-builder