Ran PHPCS on Database post-rebasing branch