fix findbugs
Merge branch 'executor_thread_max' into hs_staging