Merge branch 'master' into issue_827_collections

Author: moreati

tests/ansible/tests/target_test.py

@@ -86,6 +86,8 @@ def test_file_exists(self):
             self.assertFalse(self.func(bleh))
             self.assertEquals(open(bleh).read(), 'derp')
 
+    @unittest2.skipIf(
+        os.geteuid() == 0, 'writes by root ignore directory permissions')
     def test_unwriteable(self):
         with NamedTemporaryDirectory() as temp_path:
             os.chmod(temp_path, 0)