Merging changes due to renaming of bpmn jaggery app, ndatasource fix, and test suite adjustments