#1860706 - reported by timtrinidad, reviewed and tested by omega8cc - Native support for D6 lock backend
Merge remote-tracking branch 'origin/7.x-2.x' into 7.x-2.x-o8-2.5