Last cleanup for the multiline label removal
Merging a fix for unresolved imports of JMultiLineLabel from James.