Fix to bug 567(http://bugs.mariadb.com/show_bug.cgi?id=567)
log_manager.cc: if the file exists, is a symbolic link and is not writable, the log manager does not fail but unlinks it and creates a new one.
Additional tests for maxadmin and diagnostics within maxscale
Merge branch 'develop' into shm_log_fix
Merge branch 'develop' of github.com:skysql/MaxScale into develop
Merge branch 'develop' of github.com:skysql/MaxScale into develop
Fix to #571, http://bugs.mariadb.com/show_bug.cgi?id=571
In rwsplit router, merge multiple (query) buffers to one if necessary.
Running testall target with CMake doesn't overwrite the existing MaxScale.cnf anymore.
Bug 559 - Remove password file before starting test_adminusers
Bug 570 - memory manageing in hint parameters
Merge branch 'develop' of github.com:skysql/MaxScale into develop
Bug 431 - replace == with =
Add missing trim() call to the server list code for monitors
Added support for git-doc
Merge branch 'develop' into shm_log_fix

Conflicts:
	log_manager/log_manager.cc
Merge branch 'shm_log_fix' into develop
Added a rule to restrict queries during certain hours of the day
Merge branch 'develop' into firewall