Sort channels and logs before making config lines from them

Puppet doesn't ensure that array/list orders are preserved
between runs, so each run of puppet has the potential to
generate different output.

This caused ircecho to flap every time puppet was run since
it detected new config.

Bug: 46312
Change-Id: I288e9b0e6834e77a84517aea521db2ca9c804d12
Add bond ip for network node in eqiad

Change-Id: Ia44669ba74c45c0e7017dd71b2e1285ffc9742a2
Merge "Sort channels and logs before making config lines from them" into production