Layout specification and discovery should follow the same behavior as partials

Fixes #1047
nit: "discovery" or "find operation" instead of "match"?  prefer we use one term for finding the page throughout