Re-add composer lock.
Merge branch 'SCHOLAR-3.x' into 2271-revert