plugin definitions not merged correctly

If both a parent, and a child plugin reference a plugin, the plugin configuration is not merged correctly; instead, the child build ends up with two copies of the plugin (with separate configuration and separate executions).

The attachment contains a testcase demonstrating the problem, and fixes to ModelUtils.java (against current trunk) to fix it.