Merge pull request #758 from rmansoor/master

PDI-10274 - Fixed compile errors in migrator
BISERVER-9514 - Fixed the PRPT import issues