Remove unused code in contrib/ec2/controllers.py

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

Change-Id: I4362f99e6119699328ba112d5106148669d405a2
Closes-Bug: #1264946
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"