Merge "Pass phpcs-strict on includes/rcfeed/"