Add branch trunk-staging for merging from luke-zoni


git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/trunk-staging@1351915 13f79535-47bb-0310-9956-ffa450edef68