Designer process with space in name creates invalid ID

Created a BPMN2 process using Designer 2.2. The process ID was automatically created from the package and process names. Spaces were used in the process name, these spaces were pulled through in the process ID. On saving the process Designer 2.2 wrote an XML file with an invalid process ID, and so could not be reloaded.

09:53:26,916 INFO [stdout] (http--0.0.0.0-8080-3) (null: 7, 153): cvc-attribute.3: The value 'Package.Process Name' of attribute 'id' on element 'bpmn2:process' is not valid with respect to its type, 'ID'.
09:53:26,980 ERROR [stderr] (http--0.0.0.0-8080-1) org.eclipse.emf.ecore.resource.Resource$IOWrappedException: Unresolved reference 'Package.Process'. (inputStream://dummyUriWithValidSuffix.xml, 84, 107)
09:53:26,983 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl.handleErrors(XMLLoadImpl.java:83)
09:53:26,986 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl.load(XMLLoadImpl.java:191)
09:53:26,989 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl.doLoad(XMLResourceImpl.java:180)
09:53:26,994 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.resource.impl.ResourceImpl.load(ResourceImpl.java:1494)
09:53:26,996 ERROR [stderr] (http--0.0.0.0-8080-1) at org.jbpm.designer.web.profile.impl.JbpmProfileImpl.getDefinitions(JbpmProfileImpl.java:289)
09:53:26,999 ERROR [stderr] (http--0.0.0.0-8080-1) at org.jbpm.designer.web.profile.impl.JbpmProfileImpl$2.parseModel(JbpmProfileImpl.java:268)
09:53:27,003 ERROR [stderr] (http--0.0.0.0-8080-1) at org.jbpm.designer.web.repository.impl.UUIDBasedJbpmRepository.load(UUIDBasedJbpmRepository.java:35)
09:53:27,006 ERROR [stderr] (http--0.0.0.0-8080-1) at org.jbpm.designer.web.server.UUIDBasedRepositoryServlet.doGet(UUIDBasedRepositoryServlet.java:120)
09:53:27,010 ERROR [stderr] (http--0.0.0.0-8080-1) at javax.servlet.http.HttpServlet.service(HttpServlet.java:734)
09:53:27,015 ERROR [stderr] (http--0.0.0.0-8080-1) at javax.servlet.http.HttpServlet.service(HttpServlet.java:847)
09:53:27,017 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:329)
09:53:27,020 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:248)
09:53:27,024 ERROR [stderr] (http--0.0.0.0-8080-1) at org.jbpm.designer.web.filter.impl.PluggableFilter.doFilter(PluggableFilter.java:70)
09:53:27,027 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:280)
09:53:27,031 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:248)
09:53:27,034 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:275)
09:53:27,038 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:161)
09:53:27,042 ERROR [stderr] (http--0.0.0.0-8080-1) at org.jboss.as.web.security.SecurityContextAssociationValve.invoke(SecurityContextAssociationValve.java:153)
09:53:27,046 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:155)
09:53:27,050 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
09:53:27,053 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
09:53:27,056 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:368)
09:53:27,059 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:877)
09:53:27,063 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:671)
09:53:27,068 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:930)
09:53:27,071 ERROR [stderr] (http--0.0.0.0-8080-1) at java.lang.Thread.run(Thread.java:722)
09:53:27,072 ERROR [stderr] (http--0.0.0.0-8080-1) Caused by: org.eclipse.emf.ecore.xmi.UnresolvedReferenceException: Unresolved reference 'Package.Process'. (inputStream://dummyUriWithValidSuffix.xml, 84, 107)
09:53:27,078 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.xmi.impl.XMLHandler.handleForwardReferences(XMLHandler.java:1154)
09:53:27,083 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.xmi.impl.XMLHandler.endDocument(XMLHandler.java:1228)
09:53:27,085 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.parsers.AbstractSAXParser.endDocument(Unknown Source)
09:53:27,089 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.impl.XMLDocumentScannerImpl.endEntity(Unknown Source)
09:53:27,092 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.impl.XMLEntityManager.endEntity(Unknown Source)
09:53:27,095 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.impl.XMLEntityScanner.load(Unknown Source)
09:53:27,098 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.impl.XMLEntityScanner.skipSpaces(Unknown Source)
09:53:27,101 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.impl.XMLDocumentScannerImpl$TrailingMiscDispatcher.dispatch(Unknown Source)
09:53:27,105 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.impl.XMLDocumentFragmentScannerImpl.scanDocument(Unknown Source)
09:53:27,109 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.parsers.XML11Configuration.parse(Unknown Source)
09:53:27,113 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.parsers.XML11Configuration.parse(Unknown Source)
09:53:27,114 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.parsers.XMLParser.parse(Unknown Source)
09:53:27,116 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.parsers.AbstractSAXParser.parse(Unknown Source)
09:53:27,119 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.jaxp.SAXParserImpl$JAXPSAXParser.parse(Unknown Source)
09:53:27,121 ERROR [stderr] (http--0.0.0.0-8080-1) at org.apache.xerces.jaxp.SAXParserImpl.parse(Unknown Source)
09:53:27,123 ERROR [stderr] (http--0.0.0.0-8080-1) at org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl.load(XMLLoadImpl.java:181)
09:53:27,125 ERROR [stderr] (http--0.0.0.0-8080-1) ... 24 more
09:53:27,127 ERROR [org.jbpm.designer.web.profile.impl.JbpmProfileImpl] (http--0.0.0.0-8080-1) null: java.lang.NullPointerException
at org.jbpm.designer.bpmn2.impl.Bpmn2JsonMarshaller.marshallDefinitions(Bpmn2JsonMarshaller.java:201) [classes:]
at org.jbpm.designer.bpmn2.impl.Bpmn2JsonMarshaller.marshall(Bpmn2JsonMarshaller.java:157) [classes:]
at org.jbpm.designer.web.profile.impl.JbpmProfileImpl$2.parseModel(JbpmProfileImpl.java:268) [classes:]
at org.jbpm.designer.web.repository.impl.UUIDBasedJbpmRepository.load(UUIDBasedJbpmRepository.java:35) [classes:]
at org.jbpm.designer.web.server.UUIDBasedRepositoryServlet.doGet(UUIDBasedRepositoryServlet.java:120) [classes:]
at javax.servlet.http.HttpServlet.service(HttpServlet.java:734) [jboss-servlet-api_3.0_spec-1.0.0.Final.jar:1.0.0.Final]
at javax.servlet.http.HttpServlet.service(HttpServlet.java:847) [jboss-servlet-api_3.0_spec-1.0.0.Final.jar:1.0.0.Final]
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:329) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:248) [jbossweb-7.0.13.Final.jar:]
at org.jbpm.designer.web.filter.impl.PluggableFilter.doFilter(PluggableFilter.java:70) [classes:]
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:280) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:248) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:275) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:161) [jbossweb-7.0.13.Final.jar:]
at org.jboss.as.web.security.SecurityContextAssociationValve.invoke(SecurityContextAssociationValve.java:153) [jboss-as-web-7.1.1.Final.jar:7.1.1.Final]
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:155) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109) [jbossweb-7.0.13.Final.jar:]
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:368) [jbossweb-7.0.13.Final.jar:]
at org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:877) [jbossweb-7.0.13.Final.jar:]
at org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:671) [jbossweb-7.0.13.Final.jar:]
at org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:930) [jbossweb-7.0.13.Final.jar:]
at java.lang.Thread.run(Thread.java:722) [rt.jar:1.7.0_03]