Merge branch kamailio/trunk/db_flatstore into sip-router/janakj/db_flatstore.