Merge "Added --multiversiononly option to image SHA1 population script"