Merge ngwpc-candidate into ngwpc-release for release 3.1.2.1.0#16

cmaynard-ngwpc merged 2 commits intongwpc-releaseNGWPC/cfe:ngwpc-releasefrom

ngwpc-candidateNGWPC/cfe:ngwpc-candidateCopy head branch name to clipboard