Merge pull request #3376 from kgaillot/best-practices
Move regular expression expansion to libcrmcommon