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