Merge in Lark branch to HCC branch.
Merge branch 'master' of https://github.com/unlhcc/hcc-packaging