compilation fix for distlock change #775
Merge branch 'bugfixes/tokumx-1.3'