Merging changes due to renaming of bpmn jaggery app