Use correct name in copyright
fix tests
Promote feedback to trunk.
sync with ix repo r1526, merge in datagrid