Move utility package 'term' to pkg/term
Merge pull request #3330 from shykes/pkg-term

Move utility package 'term' to pkg/term