[master] Merge branch 'trac2438'

resolved Conflicts:
	src/lib/dns/python/Makefile.am
	src/lib/dns/python/rrset_collection_python.cc
	src/lib/dns/python/rrset_collection_python.h
	src/lib/dns/python/rrset_collection_python_inc.cc

diff --cc configure.ac
Simple merge

diff --cc src/lib/dns/rrset_collection_base.h
Simple merge

diff --cc src/lib/python/isc/datasrc/datasrc.cc
Simple merge

diff --cc src/lib/python/isc/datasrc/tests/datasrc_test.py
Simple merge