resolve conflict between test types defined for QuickBook and types for

production.
make subtests build in the same subdirectory.


[SVN r30878]

tools/quickbook

@@ -1 +1 @@
-Subproject commit 9350d67090074b116c7ed8f2e8aa07abe140b74d
+Subproject commit 303069a71b3c8ca717f3224eebcc265a623d430f