Fixes for ordering of menu objects

Stewart Martin-Haughrequested to merge
smh/athena:fixes_for_ATR-20541 into master

Fixes to make sequences generated in menu code reproducible. Fix for ATR-20541.

Merge request reports