Merge changes from topic "columnz"

* changes:
  Resolve symlinks when listing scan paths.
  Use newly defined columns for directory names.