Merge "Some phpcs-strict changes on includes/revisiondelete/"