fixed a bug in the PCMMError codes/descriptions
Merge branch
Fix typo and revert CMTS back to local