Add the CLI to the template configuration file
Merge branch 'develop' of github.com:skysql/MaxScale into develop