Take migration bugfixes from trunk. git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/stable@1370643 13f79535-47bb-0310-9956-ffa450edef68