common/docker: Clean up branch slightly prior to merge