Sync with official dnsjava 2.1.5