Branch b1_6

Accept the old ost_num_threads parameter but warn that it
is deprecated, and fix an off-by-one error that caused an LBUG.

Original patch by adilger.

b=12470
i=nathan
i=scjody