Merge "Fix docker context for images being built."