Replace old hashes with new 1.9 ruby hashes (rebase)
remove trailing spaces
Repair failed test
Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes

Code cleanup: Replace old hashes and remove trailing spaces