removed 5, no longer in scope, updated 6 and refreshed patches, mostly no change, revert to older configs for now to minimize diff to tree refreshed 7 on top of 6, pending update
