Merge "Revise docker-get-container-tag-script macro"