Switch over to using a labcontrol2001 as the labs salt secondary.

This probably won't work until more work is done, but virt0 has got to go.

Change-Id: I1670d4074fd75dd29a1fe628696eeb6374aa7d27
Fully qualify icinga module in icinga role

Change-Id: Ifee2c7ef6a3fda0f0b2ffd8aec2974daa9a51743
Merge "Fully qualify icinga module in icinga role" into production