Sync changes for registry and notary

Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>