Workaround a bug by not allowing volume names that would trip the bug.

This will need to get fixed after the release.

Ticket: #6973