Issue #2141119 by larowlan: UNSTABLE: Splits MenuBlockRepository up, adds MenuBlockBuilder and MenuBlockViewBuilder