Update Matterhorn to 1.6.0-beta2
Merge branch 'master' of https://github.com/lkiesow/matterhorn-rpms