Conflicts:
	src/bin/bind10/bind10_src.py.in
	src/bin/bind10/tests/bind10_test.py.in

Just a naming convention

Piggybacking tiny fix of #213

Not tested, this is too close to the OS for doing reasonable unittests.

This will allow some testing of it. The change was verified by systest.

	src/bin/xfrout/tests/xfrout_test.py.in
	src/bin/xfrout/xfrout.py.in
	src/bin/xfrout/xfrout_messages.mes