am 28f17701: Merge "Don\'t fail a test just because we aren\'t root."

* commit '28f1770101d84153e100ad7bc0628b4ef3b6e85c':
  Don't fail a test just because we aren't root.