Merge branch 'Issue-2372659' into 7.x-1.x
Issue #2333865: Keep Acquia Lift make file up-to-date
Merge branch 'Issue-2333865' into develop