Merge branch 'trunk' into collaboration/single-table

# Conflicts:
#	src/wp-includes/collaboration/class-wp-http-polling-collaboration-server.php
#	tests/phpunit/tests/rest-api/rest-sync-server.php

Author: peterwilsoncc