Merge branch 'Issue-2389591' into 7.x-1.x
Issue #2333865: Keep Acquia Lift make file up-to-date
Issue #2393099 by eshta: Fix JS error when no campaigns have been added.
Merge branch 'Issue-2393099' into RC

Conflicts:
	js/acquia_lift.personalize.js.map