merge from upstream phabricator
Merge branch 'master' of github.com:Khan/internal-webserver

Conflicts:
	arcanist/scripts/lib/PhutilLibraryMapBuilder.php
	arcanist/scripts/php_extension_functions.txt
	arcanist/src/workflow/ArcanistDiffWorkflow.php
	arcanist/src/workflow/ArcanistGetConfigWorkflow.php
	arcanist/src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
	libphutil/src/__phutil_library_map__.php
	libphutil/src/aphront/storage/connection/AphrontDatabaseConnection.php
	libphutil/src/aphront/storage/connection/AphrontDatabaseTransactionState.php
	libphutil/src/aphront/storage/connection/AphrontIsolatedDatabaseConnection.php
	libphutil/src/aphront/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
	libphutil/src/aphront/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php
	libphutil/src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
	libphutil/src/aphront/storage/exception/AphrontQueryAccessDeniedException.php
	libphutil/src/aphront/storage/exception/AphrontQueryConnectionException.php
	libphutil/src/aphront/storage/exception/AphrontQueryConnectionLostException.php
	libphutil/src/aphront/storage/exception/AphrontQueryCountException.php
	libphutil/src/aphront/storage/exception/AphrontQueryDeadlockException.php
	libphutil/src/aphront/storage/exception/AphrontQueryDuplicateKeyException.php
	libphutil/src/aphront/storage/exception/AphrontQueryException.php
	libphutil/src/aphront/storage/exception/AphrontQueryObjectMissingException.php
	libphutil/src/aphront/storage/exception/AphrontQueryParameterException.php
	libphutil/src/aphront/storage/exception/AphrontQueryRecoverableException.php
	libphutil/src/channel/PhutilSocketChannel.php
	libphutil/src/console/PhutilConsole.php
	libphutil/src/console/PhutilConsoleMessage.php
	libphutil/src/console/PhutilConsoleServer.php
	libphutil/src/xsprintf/qsprintf.php
	libphutil/src/xsprintf/queryfx.php
	phabricator/conf/default.conf.php
	phabricator/src/__celerity_resource_map__.php
	phabricator/src/__phutil_library_map__.php
	phabricator/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
	phabricator/src/applications/audit/view/PhabricatorAuditListView.php
	phabricator/src/applications/auth/ldap/PhabricatorLDAPProvider.php
	phabricator/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_query_Method.php
	phabricator/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	phabricator/src/applications/diffusion/controller/DiffusionCommitController.php
	phabricator/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
	phabricator/src/applications/diffusion/view/DiffusionCommitChangeTableView.php
	phabricator/src/applications/directory/controller/PhabricatorDirectoryMainController.php
	phabricator/src/applications/fact/controller/PhabricatorFactController.php
	phabricator/src/applications/fact/storage/PhabricatorFactRaw.php
	phabricator/src/applications/feed/PhabricatorFeedQuery.php
	phabricator/src/applications/maniphest/view/ManiphestTransactionDetailView.php
	phabricator/src/applications/notification/controller/PhabricatorNotificationListController.php
	phabricator/src/applications/owners/storage/PhabricatorOwnersPackage.php
	phabricator/src/applications/phame/controller/blog/list/PhameAllBlogListController.php
	phabricator/src/applications/phame/controller/blog/list/PhameUserBlogListController.php
	phabricator/src/applications/phame/controller/post/list/PhamePostListBaseController.php
	phabricator/src/applications/phame/controller/post/list/PhamePostListController.php
	phabricator/src/applications/project/controller/PhabricatorProjectProfileController.php
	phabricator/src/applications/project/controller/PhabricatorProjectProfileEditController.php
	phabricator/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php
	phabricator/src/docs/userguide/arcanist_commit_ranges.diviner
	phabricator/src/docs/userguide/events.diviner
	phabricator/src/infrastructure/daemon/PhabricatorDaemonControl.php
	phabricator/src/infrastructure/events/constant/PhabricatorEventType.php
	phabricator/src/infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php
	phabricator/src/infrastructure/storage/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php
	phabricator/src/infrastructure/storage/__tests__/AphrontMySQLDatabaseConnectionTestCase.php
	phabricator/src/infrastructure/storage/__tests__/QueryFormattingTestCase.php
	phabricator/src/infrastructure/storage/connection/AphrontDatabaseConnection.php
	phabricator/src/infrastructure/storage/connection/AphrontDatabaseTransactionState.php
	phabricator/src/infrastructure/storage/connection/AphrontIsolatedDatabaseConnection.php
	phabricator/src/infrastructure/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php
	phabricator/src/infrastructure/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php
	phabricator/src/infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
	phabricator/src/infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php
	phabricator/src/infrastructure/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryAccessDeniedException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryConnectionException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryConnectionLostException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryCountException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryDeadlockException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryDuplicateKeyException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryObjectMissingException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryParameterException.php
	phabricator/src/infrastructure/storage/exception/AphrontQueryRecoverableException.php
	phabricator/src/infrastructure/storage/exception/AphrontQuerySchemaException.php
	phabricator/src/infrastructure/storage/lisk/LiskMigrationIterator.php
	phabricator/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
	phabricator/src/infrastructure/storage/query/__tests__/QueryFormattingTestCase.php
	phabricator/src/infrastructure/storage/query/qsprintf.php
	phabricator/src/infrastructure/storage/query/queryfx.php
	phabricator/src/infrastructure/util/PhabricatorGlobalLock.php
	phabricator/src/storage/AphrontDatabaseTransactionState.php
	phabricator/src/storage/__tests__/QueryFormattingTestCase.php
	phabricator/src/storage/connection/AphrontDatabaseConnection.php
	phabricator/src/storage/connection/AphrontIsolatedDatabaseConnection.php
	phabricator/src/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php
	phabricator/src/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php
	phabricator/src/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
	phabricator/src/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php
	phabricator/src/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
	phabricator/src/storage/exception/AphrontQueryAccessDeniedException.php
	phabricator/src/storage/exception/AphrontQueryConnectionException.php
	phabricator/src/storage/exception/AphrontQueryConnectionLostException.php
	phabricator/src/storage/exception/AphrontQueryCountException.php
	phabricator/src/storage/exception/AphrontQueryDeadlockException.php
	phabricator/src/storage/exception/AphrontQueryDuplicateKeyException.php
	phabricator/src/storage/exception/AphrontQueryException.php
	phabricator/src/storage/exception/AphrontQueryObjectMissingException.php
	phabricator/src/storage/exception/AphrontQueryParameterException.php
	phabricator/src/storage/exception/AphrontQueryRecoverableException.php
	phabricator/src/storage/exception/AphrontQuerySchemaException.php
	phabricator/src/storage/qsprintf.php
	phabricator/src/storage/queryfx.php
	phabricator/src/view/form/control/AphrontFormImageControl.php
	phabricator/src/view/page/PhabricatorStandardPageView.php
	phabricator/webroot/index.php
	phabricator/webroot/rsrc/css/application/base/standard-page-view.css
	phabricator/webroot/rsrc/image/custom/README