Prototype-1.7.ch: added most changes in test 1.6.1 from r32594 to r50663 (see CH_CHANGELOG for left out changes)
Prototype-1.7.ch: added most changes in test 1.6.1 from r32594 to r50663 (see CH_CHANGELOG for left out changes)

git-svn-id: d6dc07e4c1a8c2307c9de2227421a9f74084ccdb@52660 3e26f76b-fb05-0410-91fc-a0551e8366c8

ConnectHolland/Prototype,ConnectHolland/Prototype,ConnectHolland/Prototype