Get `and_call_original` to work properly on class hierarchies.

For #613.
Merge pull request #649 from rspec/fix-613

Get `and_call_original` to work properly on class hierarchies.