Both Neon and Oxygen needed some changes for correct use of the
way we refer to menus and fields.
(From yocto-docs rev: 1cb20243194e61b925df6b0a3b136233f1da8a57)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>