Fixup 1edb4bb6093aa483ee5df20817d64b9d9d6d7051
Fix service killing from AWS.

There was a RPC system misusage that prevented the socket connection.
Moreover, the problem was not duly signalled to the caller. Both
problems have been fixed.
nginx: correctly mangle Location URL for RWS.

Closes #228.
Finish adding `from __future__ import unicode_literals` to all files

Now it's in all files except those in cmstestsuite/code/ and docs/.
Fix some remaining uses of open instead of io.open
Do not use explicit casts to str
Fix tests

They still thought testcases were identified by a number instead of a
codename.
Improve argument parsing

Don't fail on non-ASCII chars on Python 2 and uniform the syntax
(use a consistent parameter order, always give action, remove options
that were using default values).
Fix a couple of comments
Improve sample nginx.conf by using keep-alive connections to backends
Typo in a CWS template
Merge remote-tracking branch 'upstream/master'

Merge with original repository.
Merge branch 'master' into hsgs

Merge with update from master branch.