Encode consoleauth token in utf-8 to make it a str

This is needed for memcached backend, because the key cannot be a
unicode object in any of the exposed functions.

Fixes bug 1164784

Co-authored-by: Stanislaw Pitucha <stanislaw.pitucha@hp.com>

Change-Id: Ieb1429116d96eefe97564fe92631063dc16117cb
If rescue fails don't error the instance

If a rescue attempt fails, the VM's state should return to what it was
before the rescue attempt started, and the user should be notified of
the failure.

Fixes bug: 1170328

Change-Id: If5e97d06a3617adad83a4bba2ac6320616bbe83b
Merge "Encode consoleauth token in utf-8 to make it a str"
Merge "If rescue fails don't error the instance"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp