Remove unused code in contrib/ec2/controllers.py

"token_id = uuid.uuid4().hex" is unused code, remove it

Change-Id: I4362f99e6119699328ba112d5106148669d405a2
Closes-Bug: #1264946
Fix typo in test

A single-char typo in test_auth caused a value that should have
been a simple string into a tuple of strings. This made the test
generate what's actually invalid input data since the username
is supposed to be a simple string.

Change-Id: I7a477bb8e5504c1c7982cf56ffe69e1c5294cadf
Related-bug: #1265108
Remove unused imports

Remove unused imports in doc/ext/apidoc.py

Change-Id: I379ab62564631e7c5a9b616b6eabcc6b4d9e966c
Closes-Bug: #1265332
Merge "Remove unused code in contrib/ec2/controllers.py"
Merge "Remove unused imports"
Merge "Fix typo in test"