Sync with LPC
Merge branch 'HTBin' of github.com:zhenbinwu/CMSUpgrade into HTBin