[rhq-project/rhq] e6cb20: Fix db-upgrade.xml due to bad merge.

[Jay Shaughnessy]

Branch: refs/heads/master
  Home:   https://github.com/rhq-project/rhq
  Commit: e6cb202240492135aa1783aa8c88f4b0537c3212
      https://github.com/rhq-project/rhq/commit/e6cb202240492135aa1783aa8c88f4b053...
  Author: Jay Shaughnessy 
  Date:   2014-08-20 (Wed, 20 Aug 2014)

Changed paths:
    M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml

Log Message:
  -----------
  Fix db-upgrade.xml due to bad merge.