The root_node_as_master option needs to be disabled for 2.1 testing.
Some tests used galera options that aren't in 2.0 which caused the tests to fail. Also added an upper limit to some tests to reduce excessive execution times.
Added tests from develop. The test results need to be modified for 2.0.
