Merge "Fix PHPCS warnings in includes/installer"