prevent multi threaded run_tests for catkin_make too (follow up of 2bb6fb08cf2ed086cc0cffe310e4f8dce0f41ebb)
auto detect former SETUPTOOLS_DEB_LAYOUT (fix #418)
modify nosetests invocation to skip any path adjustment
Merge branch 'groovy-devel' of github.com:ros/catkin into groovy-devel