Merge "[COMMON] Fix docker-registry-key empty creds"