No need to loop over with pkill -f

I guess four times is better than one but if we need four times to kill
swift processes there is something pretty bad with it.

Change-Id: Id2ea2f4ca60feb9fddc7b3181063760d2044b421
Add while/until to the for/do rule

Like 'for/do' check that the while/until operator are on
the same line with the do.

Fixes some pep8 error along the way.

Change-Id: I440afe60691263365bf35310bf4212d94f30c339
Merge "Add while/until to the for/do rule"
Merge "No need to loop over with pkill -f"
Merge commit 'refs/changes/71/70571/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch
Merge commit 'refs/changes/99/70999/4' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch