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