Merge "Allow "demo" volume name to be used for retail." into rvc-dev