Merge changes from topic "jan14b"

* changes:
  Prefer earlier-sorted strings for tie-breaking.
  Apply volumeName expansion at mount/unmount.
  Expand our test coverage.