Address issues from code review. #4465

Most notable is that we now delete the cookie from the environment
instead of setting it to 'unavailable'.  This will likely work
better with glidein-like nested HTCondor environments.