BZ1120897 fixes
Merge pull request #5641 from CowboysFan/bug_1120897

Merged by openshift-bot
use ident instead of name in deconfigure invocation
Bug 1119830: Corrected filename for MCollective server.cfg
Merge pull request #5643 from bparees/master

Merged by openshift-bot
Merge pull request #5645 from nhr/bug_1119830

Merged by openshift-bot