Complete refactoring of the merge system taking advantage of tokens being in...

Complete refactoring of the merge system taking advantage of tokens being in core. Removed both merge hooks as they would be redundant. To add additional merge values, simply use the token hooks and add values to the user collection. Resolves #1132674.