Merge branch 'master' into lc-time-disable

diff --cc qa/tasks/s3tests.py
index ee16381d1b491b027bcd84d4bce200b4f2cd5569,954983b8e2e2c834ff9bbb184cdef364abd21e0c..00bc6b4e34aef12e2ed8a59633a9ca27b3ce055d
--- 1/qa/tasks/s3tests.py
--- 2/qa/tasks/s3tests.py
+++ b/qa/tasks/s3tests.py
@@@ -228,7 -228,10 +228,10 @@@ def run_tests(ctx, config)
      """
      assert isinstance(config, dict)
      testdir = teuthology.get_testdir(ctx)
 -    attrs = ["!fails_on_rgw", "!lifecycle"]
 +    attrs = ["!fails_on_rgw"]
+     # beast parser is strict about unreadable headers
+     if ctx.rgw.frontend == 'beast':
+         attrs.append("!fails_strict_rfc2616")
      for client, client_config in config.iteritems():
          args = [
              'S3TEST_CONF={tdir}/archive/s3-tests.{client}.conf'.format(tdir=testdir, client=client),