Add waiting to system variant (or should it be a level property?)
Merge some property lists for better maintainability.
Authored by: utunnels 2011-12-15
Parent: [r3631]
Child: [r3633]
