SWC-676: move to shared utility class
SWC-677: greatly simplify layout for wiki subpage widget
Merge pull request #402 from jay-hodgson/develop

Merge down from release-1