Pull up changes for CONNECTORS-956 from trunk.  Also add switch on Schema tab to allow selection of old vs new behavior.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/dev_1x@1626166 13f79535-47bb-0310-9956-ffa450edef68