Code review comment for lp:~rlane/nova/lp666554

Looks like you need a quick merge of trunk and a few pep8 fixes before it will merge
 pep8 --repeat nova
nova/utils.py:220:1: W293 blank line contains whitespace
nova/utils.py:223:1: W293 blank line contains whitespace
nova/utils.py:239:1: W391 blank line at end of file
nova/utils.py:239:1: W293 blank line contains whitespace
nova/compute/disk.py:175:47: E261 at least two spaces before inline comment
nova/tests/api/openstack/test_api.py:27:1: E302 expected 2 blank lines, found 1
nova/tests/api/openstack/test_api.py:33:9: E301 expected 1 blank line, found 0
nova/tests/api/openstack/test_api.py:36:9: E301 expected 1 blank line, found 0
nova/tests/api/openstack/test_api.py:39:9: E301 expected 1 blank line, found 0