Bug 1109061 - Remove some useless variables r=standard8 a=aleth

--HG--
extra : rebase_source : e1a9c0d14d15d34ab617af5e698299721006dc07
Bug 1109058 - Fix the guard (different #ifdef & #define) r=standard8 a=aleth

--HG--
extra : rebase_source : c6500868e29f663a629d314b5110bbe97f187bc1
Bug 1109057 - update client.py to follow flake8 conventions r=callek a=aleth

--HG--
extra : rebase_source : 2dc8334b7c90db0c439c55b976f9a65198f2a9fe