Update minimum php version and composer.lock
Fix composer.lock
Merge branch 'master' into PIM-1494