Merge "Revert "Pass phpcs-strict on includes/revisiondelete/""