CAAERS-6413 fixes for NPE and migrator
Merge branch 'master' of git://github.com/NCIP/caaers