Rspec 2 99 maintenance

Add parity branch to work against RSpec 2-99 intermediate upgrade version.

**DO NOT MERGE INTO MASTER**