(Merging 389199:389201 from branch.) o Cleaned up example in the comment-header of the plugin-metadata.mdo o Added code to initialize a dummy Model instance in MavenProject, to avoid NPEs in things like getId().