Merge branch 'fix-127' into feature-MAX-2

Conflicts:
server/core/dbusers.c
server/core/service.c
server/core/users.c
server/include/dbusers.h
server/include/users.h
server/modules/protocol/mysql_client.c
server/modules/protocol/mysql_common.c
Compile errors fixed

Compile errors fixed
Removed extra header file inclusion

Removed extra header file inclusion
Branch updated from develop

Branch updated from develop
Removed duplicated code

Removed duplicated code