m_callerid Simplify code interacting with containers
m_callerid Add typedefs for containers in callerid_data
m_callerid Change CallerIdDataSet (wholistsme) to be a vector
Merge branch 'master+callerid' into master+flatmap
Add typedef PrivSet for OperInfo::AllowedOperCommands and AllowedPrivs
Add typedef ModeParser::ModeWatcherMap, remove ModeWatchIter
Add flat_[multi]{map,set} containers
Change type of some associative containers to their flat versions, including Extensible storage
Merge branch 'master+flatmap'