Platform driver CI-OMS alignment and cleanup

@edwardhunter please review/merge