refs #9257. Have the integration working.

Have the integration working parallel and non parallel. Peformance tests
have reduced in speed by 1/2 so now run in approximately 1/2 a second. The
non-parallel version runs quicker than the parallel version indicating
that some work still needs to be done to improve the speed of the merging.