+ [OES-426] benign change to prevent variable error for status definition
[OES-440] Don't overwrite display order with default when it's zero.
Fix OperationBooking_Operation test
Merge branch 'release/1.7' into release/orbis-r2