Some of the testing fixes weren't included into 2.1 and due to that, a few of the tests appear to fail.
The slave part of the binlogrouter replication can be ignored for avrorouter tests. This will speed up the testing by skipping the unnecessary restarting and configuration of slave servers.
Added tests from develop. The test results need to be modified for 2.0.
