merge 3.18.4 into default
server/test/unittest_migractions fails due to interaction between new
constraint test (from 3.18) and composite deletion change (in 3.19).
[MESSAGES CONTROL]
disable-msg = C0301
[VARIABLES]
# Enable / disable this checker
enable-variables = yes
additional-builtins = _, display_name
[BASIC]
required-attributes=
attr-rgx = (w|[a-z_][a-z0-9_]{2,30})
variable-rgx = (w|[a-z_][a-z0-9_]{2,30})$
argument-rgx = (w|[a-z_][a-z0-9_]{2,30})$
[TYPECHECK]
generated-members=debug,info,notice,warning,error,critical,exception