Merge branch '7.x-1.x' of github.com:imagex/imagex_workflow into LDC-572

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.