cleaned up some of the linking dependency graph #869
Merge branch 'bugfixes/tokumx-1.3'