Upgrade to discovery-server 1.16