Generalized htmlbars package imports
Merge pull request #5346 from mmun/patch-3

Generalized htmlbars package imports