Call individual routing rules sections one at a time so that we can put reqidel/reqadd lines after block lines and before redirect lines
Test to make sure reqidel/reqadd rules get added in the right place
Merge branch 'master' into eherot/automatic_cluster_building

Conflicts:
	test/integration/default/serverspec/default_spec.rb (doh!)