Update code from broken merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	whois-update/src/main/java/net/apnic/db/whois/update/authentication/strategy/AutnumAuthentication.java
Update code from broken merge