Fix duplicate OAM locid
Merge branch 'master' into AmazingJaze/CascadingFlyout