Merge branch 'Issue-2376887' into 7.x-1.x
Merge branch 'RC' into 7.x-1.x
Issue #2333865: Keep Acquia Lift make file up-to-date
Issue #2385181 by eshta: Adding images for variation types.
Merge branch 'Issue-2385181' into develop