Merge changes from topic 'faster-aco' into 15

* changes:
  aco: Minimize use of regex.
  aco: Create ways to minimize use of regex.

diff --cc main/cdr.c
Simple merge

diff --cc res/res_hep.c
Simple merge