Merge remote-tracking branch 'cprice/refactor/2.7.x/13690-spec_helper_compatibility' into 2.7.x
- cprice/refactor/2.7.x/13690-spec_helper_compatibility: (#13690) add comments to spec_helper (#13690) Update 2.7.x for spec_helper compatibility with external projects