HF SL for run-II
Merge pull request #5229 from civanch/HF_SL_for_run-II

Complete migration to HF SL for run-II