Update for v6.3~svn696-1
Revert change to upstream file
Debian patch for cpp-build/pom.xml