Making a few modules hacking 0.9.2 compliant

Global requirements has updating the version of hacking to a minimum of
0.9.2 and it has brought a whole slew of changes. This is tackling five
modules which contain new violations.

Change-Id: Iee1dc1006eaefd0fff99bb1a4924a37c4332c044
Merge "Making a few modules hacking 0.9.2 compliant"