Redisabling test_cancel and uncrustify.
Merge branch 'master' into parallel_pipelining_integration