Fix for config file ordering
Merge branch 'develop' of github.com:skysql/MaxScale into develop
Fix for compiler warnings