XD-430 different JMX port for admin and container
XD-438: Parser Changes to support named channels.

Ensures the "type" of each mode is correct when named channels are in
use. Checking whether there is only one module is no longer enough to
indicate that we have a job or trigger.
Merge remote-tracking branch 'markfisher/XD-430'