Merge branch 'trac547-summarized' of ssh://bind10.isc.org/var/bind10/git/bind10 into trac547-summarized

Conflicts:
	src/bin/stats/tests/isc/config/ccsession.py