Merge "DO NOT MERGE Accommodate limitations of CTS web server" into marshmallow-cts-dev