Merge "zuul job: write the enable_plugin lines last"