Merge "Allow overriding rally-tag if OpenStack master"