Merge "Add EXTRA_FORMULAS parameter to 'deploy' jobs"