Merge "Make client cert authentication optional in policy-gui"