CLI commands are not consistent across

For creating a queue, CLI has "add-jms-queue", "remove-jms-queue" etc, where are "data-source" takes another approach for extensions to same command, which is not consistent across the commands in the CLI.

Also, data-source command help and as well as error message when used say "--jndi-name: missing" instead of showing the correct usage.