Add some more changes that were not captured in JIRA issues but are results of other changes
Add some more changes that were not captured in JIRA issues but are results of other changes

git-svn-id: d8f3215415546ce936cf3b822120ca56e5ebeaa0@1148211 13f79535-47bb-0310-9956-ffa450edef68

jpcaruana/buildr,jpcaruana/buildr,apache/buildr,stewi2/buildr,liamchristopher/buildr,mariusk/buildr-kawa,liamchristopher/buildr,apache/buildr,apache/buildr,apache/buildr,stewi2/buildr,stewi2/buildr,jpcaruana/buildr,mariusk/buildr-kawa,stewi2/buildr,liamchristopher/buildr,mariusk/buildr-kawa,liamchristopher/buildr,jpcaruana/buildr