Merge branch 'develop'.  Changes from Pull Request #1.
Merge branch 'develop'. Addition of procServMgr and changes to medm/ build