CSPACE-5564: Adding more support for BerkeleyMapper integration.
Merge branch 'CSPACE-5564-REM' into CSPACE-5564-REM-A
CSPACE-5564: Fixed NPE in code that is looking for static resources.
Merge branch 'CSPACE-5564-REM-A' into CSPACE-5564-REM-B