Fixed key delete
Fixed adding key
Fixed problem with application trying to overrule UID when using public-key authentication protocol
Fixed conductor grants page to use escaped identifiers
Updated version of Conductor VAD
Merge branch 'develop/6' into develop/7