Merge with trunk. Manually merged laggards. Current up to 572872. git-svn-id: https://svn.apache.org/repos/asf/ode/branches/bart@573139 13f79535-47bb-0310-9956-ffa450edef68