Up version of cnnarch2x and fix broken tests

Lukas Bramrequested to merge
up_cnnarch2x into master

Up version of cnnarch2x and revert some test changes made in commit 669eceb2

Merge request reports