Merge "Fix plugin management with Jenkins restart"