am 662b3bbe: am effefbc4: Merge "Proper security labeling of multi-user data directories."

* commit '662b3bbe08c03de77c0676b4fdc1587723863f1b':
  Proper security labeling of multi-user data directories.