- Appease checkstyle gods
- Merge branch 'cleanup/plugin-message-channel-handling' into dev/3.0.0
- Use an ImmutableList Builder
- Merge remote-tracking branch 'origin/dev/3.0.0' into cleanup/plugin-message-channel-handling
- Fix tests
- Appease checkstyle
- Fix spot
- preliminary cleanup of plugin message channel handling