Merge pull request #2672 from mhillenibm/test_num_threads