fixed lock_diag_size_limit test #524

Removed it from sharding_passthrough because it uses a MST, and commented
out the second half of the test because it needs too big of a ulimit -n.
Merge branch 'bugfixes/tokumx-1.2' into releases/tokumx-1.2