Tewlchaynz

Mostly completely useless reconciliation of groups and ordering.
Added a few missing host/target combos.

Change-Id: I224654cf3bc7de81f3cba62bdb652648f56144d7