Don't use deprecated module commands

The commands module was deprecated since version 2.6 and it has been
removed in Python 3.

See http://docs.python.org/2/library/commands#module-commands

Closes-Bug: #1248216
Change-Id: I0ae40c7683ca58ede75f493d020e5c80a6434fef
Merge "Don't use deprecated module commands"