Merge branch 'db/6640' of https://git-wip-us.apache.org/repos/asf/incubator-allura into db/6640