Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak...