OOIION-1656: Provide default for unknown datastore profile
Merge pull request #442 from mmeisinger/fix1656_ds_r2

OOIION-1656: Provide default for unknown datastore profile