Make a whole host of 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 CR is to tackle a
bunch of small hacking violations.

Change-Id: Iae1d0f40d2a13bc31cf4e688bda85c0cfd36847b
Merge "Make a whole host of modules hacking 0.9.2 compliant"