BZ 1049284 - When solving a conflict, Reopen saves the process and closes Designer

Conflicts:
	jbpm-designer-client/src/main/java/org/jbpm/designer/client/DesignerPresenter.java
	jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/config.js