Prevent load-order issue in constant_scope_for with more explicit use of
constant names
Add around hook to isolate extra constant definition.
Remove dead code.
Add changelog entry.
Merge pull request #1680 from rspec/pr-1679-fixed-up

Pr 1679 fixed up