Fix logical operator
modified changelog and code style
Merge branch 'scabrero/dns-fix-logical-operator'

Conflicts:
	main/dns/ChangeLog