Merge pull request #2838 from nrwahl2/nrwahl2-T95
libcrmcommon, tools: Various refactors and improvements