Merge branch 'charm' of charmgit:charm into pami-bgq-commthr-ready