Revert last two changes in this file

Otherwise testing stops with:
ailed to talk to service proposal create: 500: undefined method
`hash_only_merge!' for HashOnlyMerge:Module
Merge pull request #822 from dirkmueller/release/roxy/master

+1