Adapt to removal of shapelet::ModelBuilder

This has been replaced by the much-more-powerful MatrixBuilder class, and
while we're not using that as efficiently as we could, it doesn't really matter
because this whole package is on its way out.
Adapt to rename of MultiShapeletFunction's "elements" to "components"
Merge branch 'u/jbosch/DM-1188'