Merge "Minor fixes to allow local docker registry usage"