Merge "Remove TODO comment for configstore threadpool size"