Sort sources in lock the same as in 1.6
Friendly error on ENOSPC

fixes #3153
Version 1.7.2 with changelog