diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/db2/db2-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/db2/db2-jbpm-schema.sql
index a7320c23ce..f4c44aa025 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/db2/db2-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/db2/db2-jbpm-schema.sql
@@ -875,7 +875,6 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/derby/derby-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/derby/derby-jbpm-schema.sql
index 2c906c679e..77b3711afb 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/derby/derby-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/derby/derby-jbpm-schema.sql
@@ -809,7 +809,7 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/hsqldb/hsqldb-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/hsqldb/hsqldb-jbpm-schema.sql
index e5f86d82ea..760bc77a16 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/hsqldb/hsqldb-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/hsqldb/hsqldb-jbpm-schema.sql
@@ -811,7 +811,7 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
index 643b14cbd5..dbb5120d8c 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysql5/mysql5-jbpm-schema.sql
@@ -800,7 +800,6 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
index ba3c271c9a..e0587f6c0c 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/mysqlinnodb/mysql-innodb-jbpm-schema.sql
@@ -799,7 +799,6 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/oracle/oracle-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/oracle/oracle-jbpm-schema.sql
index 656e42eb49..b0752a8ce5 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/oracle/oracle-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/oracle/oracle-jbpm-schema.sql
@@ -878,7 +878,6 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-bytea-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-bytea-jbpm-schema.sql
index e7f2ba864c..6bc7fc32ab 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-bytea-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-bytea-jbpm-schema.sql
@@ -154,7 +154,7 @@ create index IDX_PInstLog_parentPInstId on ProcessInstanceLog (parentProcessInst
 create index IDX_PInstLog_pId on ProcessInstanceLog (processId);
 create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog (processInstanceDescription);
 create index IDX_PInstLog_pInstId on ProcessInstanceLog (processInstanceId);
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
 create index IDX_PInstLog_pName on ProcessInstanceLog (processName);
 create index IDX_PInstLog_pVersion on ProcessInstanceLog (processVersion);
 create index IDX_PInstLog_start_date on ProcessInstanceLog (start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-jbpm-schema.sql
index 3686227345..b92b68eb4d 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/postgresql/postgresql-jbpm-schema.sql
@@ -879,7 +879,7 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver/sqlserver-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver/sqlserver-jbpm-schema.sql
index 2289c1296a..daf4575550 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver/sqlserver-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver/sqlserver-jbpm-schema.sql
@@ -811,7 +811,7 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver2008/sqlserver2008-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver2008/sqlserver2008-jbpm-schema.sql
index b554d52996..df222acb41 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver2008/sqlserver2008-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sqlserver2008/sqlserver2008-jbpm-schema.sql
@@ -811,7 +811,7 @@
     create index IDX_PInstLog_pId on ProcessInstanceLog(processId);
     create index IDX_PInstLog_pInsteDescr on ProcessInstanceLog(processInstanceDescription);
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId);
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName);
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion);
     create index IDX_PInstLog_start_date on ProcessInstanceLog(start_date);
diff --git a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sybase/sybase-jbpm-schema.sql b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sybase/sybase-jbpm-schema.sql
index c85dfae236..78a034c7c1 100644
--- a/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sybase/sybase-jbpm-schema.sql
+++ b/jbpm-db-scripts/src/main/resources/db/ddl-scripts/sybase/sybase-jbpm-schema.sql
@@ -983,8 +983,6 @@
     go
     create index IDX_PInstLog_pInstId on ProcessInstanceLog(processInstanceId)
     go
-    create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4)
-    go
     create index IDX_PInstLog_pName on ProcessInstanceLog(processName)
     go
     create index IDX_PInstLog_pVersion on ProcessInstanceLog(processVersion)
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/db2/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/db2/rhpam-7.13.1-to-7.13.5.sql
deleted file mode 100644
index 48d2d4e68e..0000000000
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/db2/rhpam-7.13.1-to-7.13.5.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/derby/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/derby/rhpam-7.13.1-to-7.13.5.sql
index 48d2d4e68e..932771f9ac 100644
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/derby/rhpam-7.13.1-to-7.13.5.sql
+++ b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/derby/rhpam-7.13.1-to-7.13.5.sql
@@ -1 +1 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/hsqldb/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/hsqldb/rhpam-7.13.1-to-7.13.5.sql
index 48d2d4e68e..932771f9ac 100644
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/hsqldb/rhpam-7.13.1-to-7.13.5.sql
+++ b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/hsqldb/rhpam-7.13.1-to-7.13.5.sql
@@ -1 +1 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/rhpam-7.13.1-to-7.13.5.sql
deleted file mode 100644
index 48d2d4e68e..0000000000
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysql5/rhpam-7.13.1-to-7.13.5.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/rhpam-7.13.1-to-7.13.5.sql
deleted file mode 100644
index 48d2d4e68e..0000000000
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/mysqlinnodb/rhpam-7.13.1-to-7.13.5.sql
+++ /dev/null
@@ -1 +0,0 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/postgresql/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/postgresql/rhpam-7.13.1-to-7.13.5.sql
index 48d2d4e68e..932771f9ac 100644
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/postgresql/rhpam-7.13.1-to-7.13.5.sql
+++ b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/postgresql/rhpam-7.13.1-to-7.13.5.sql
@@ -1 +1 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver/rhpam-7.13.1-to-7.13.5.sql
index 48d2d4e68e..932771f9ac 100644
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver/rhpam-7.13.1-to-7.13.5.sql
+++ b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver/rhpam-7.13.1-to-7.13.5.sql
@@ -1 +1 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver2008/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver2008/rhpam-7.13.1-to-7.13.5.sql
index 48d2d4e68e..932771f9ac 100644
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver2008/rhpam-7.13.1-to-7.13.5.sql
+++ b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sqlserver2008/rhpam-7.13.1-to-7.13.5.sql
@@ -1 +1 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4);
+create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog(processInstanceId, status) WHERE status IN (0,1,4);
diff --git a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sybase/rhpam-7.13.1-to-7.13.5.sql b/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sybase/rhpam-7.13.1-to-7.13.5.sql
deleted file mode 100644
index 1f013f933d..0000000000
--- a/jbpm-db-scripts/src/main/resources/db/upgrade-scripts/sybase/rhpam-7.13.1-to-7.13.5.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-create index IDX_PInstLog_pInstId_status ON ProcessInstanceLog (processInstanceId, status)  WHERE status IN (0,1,4)
-go