Merged from trunk rev.14183

diff --cc src/Makefile.am
Simple merge

diff --cc src/base/Makefile.am
index 72643db253150291cbe02eafa55397dfa249ef74,f0a3a23fe35a1028de3996f40d6fbb3668eec673..dc6811c0caadd9c59aad485a9b3a7c5e29409027
--- 1/src/base/Makefile.am
--- 2/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@@ -25,10 -25,9 +25,11 @@@ libbase_la_SOURCES = 
        CharacterSet.cc \
        InstanceId.h \
        Lock.h \
+       LookupTable.h \
        LruMap.h \
        Packable.h \
 +      RegexPattern.cc \
 +      RegexPattern.h \
        RunnersRegistry.cc \
        RunnersRegistry.h \
        Subscription.h \