Commit some schema file changes that should have been part of r1357760.
Commit some schema file changes that should have been part of r1357760.

* subversion/libsvn_wc/wc-metadata.sql
  (STMT_UPGRADE_30_SELECT_CONFLICT_SEPARATE,
   STMT_UPGRADE_30_SET_CONFLICT): New statements.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion