Merging changes for m5. 

Includes ndata source fixes, registry fixes, code corrections and updates to bpmn ui