Uncomment ProcessDataBlock widget, removed comments in process-diagram
attribute fix
Merge remote-tracking branch 'remotes/ksz/RELEASE-3.0-beta2' into RELEASE-2.1-JSP