Clean out 3.0-to-3.1 rscompat stuff from master after S3_1 branching
Once master is about 3.2 development, clean out 3.0-to-3.1 ruleset compatibility code.
Once master is about 3.2 development, clean out 3.0-to-3.1 ruleset compatibility code.