Merge trunk r38640 into 2.8 branch; fix failing Five test.

lib/python/Products/Five/tests/forms.txt

@@ -36,8 +36,9 @@ otherwise we will fail to access it:
   ... GET /test_folder_1_/ftf/+/protectedaddform.html HTTP/1.1
   ... Authorization: Basic viewer:secret
   ... """, handle_errors=False)
-  HTTP/1.1 401 Unauthorized
+  Traceback (most recent call last):
   ...
+  Unauthorized: ...
 
 Now let's add a piece of our sample content object to test more things
 on it: