If metadata.name is changed for an existing devfile, an SQL error is shown and changes cannot be saved; Discard Changes does not refresh editor

diff --git a/dependencies/che-devfile-registry/devfiles/00_java8-maven-eap/devfile.yaml b/dependencies/che-devfile-registry/devfiles/00_java8-maven-eap/devfile.yaml
index e8a3c9f1..9c39889c 100644
--- a/dependencies/che-devfile-registry/devfiles/00_java8-maven-eap/devfile.yaml
+++ b/dependencies/che-devfile-registry/devfiles/00_java8-maven-eap/devfile.yaml
@@ -43,7 +43,7 @@ commands:
   -
     name: 1. Build
     actions:
-      - workdir: '${CHE_PROJECTS_ROOT}/kitchensink-example'
+      - workdir: '${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp'
         type: exec
         command: scl enable rh-maven35 'mvn clean install'
         component: maven
@@ -65,7 +65,7 @@ commands:
         component: maven
         command: cp target/*.war /opt/eap/standalone/deployments/ROOT.war && 
           echo 'Archive was deployed, click on eap endpoint from Workspace view to open the application'
-        workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example
+        workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp
   -
     name: 4. Hot update
     actions:
@@ -73,7 +73,7 @@ commands:
         type: exec
         component: maven
         command: "scl enable rh-maven35 'mvn clean install' && sleep 2 && cp target/*.war /opt/eap/standalone/deployments/ROOT.war"
-        workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example
+        workdir: ${CHE_PROJECTS_ROOT}/kitchensink-example/kitchensink-jsp