Create impi_mapping table if it doesn't exist
Merge remote-tracking branch 'origin/rtr_cache' into sto536_handlers
A couple of fixes from testing