NH-3710 - Corrected usage of aliasedLockModes
Merge branches 'RogerKratz-NH-3570', 'rjperes-NH-2831', 'rjperes-NH-3710', 'rjperes-NH-3222', 'rjperes-NH-3650', 'hazzik-NH-2782', 'hazzik-NH-2779', 'hazzik-NH-3709', 'hazzik-NH-3049', 'amroel-NH-3697' and 'amroel-NH-3698' into 4.0.x