Bug fixes: Version string and return response copy

Version string was no longer being inserted into the DISCOVER
message properly (some PBR change?). Also, we were creating a
copy of the response that had a redacted token, but not actually
returning the copy.

Change-Id: Ied3a23a86b654ce54cf8f8280c8b46310cfff64a