Merge remote-tracking branch 'origin/develop' into MXS-122

Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c

client/CMakeLists.txt

@@ -7,4 +7,4 @@ if(HIST)
 else()
   message(STATUS "Could not find editline library. MaxAdmin will be built without it.")
 endif()
-install(TARGETS maxadmin DESTINATION bin)
+install(TARGETS maxadmin DESTINATION ${MAXSCALE_BINDIR})