PLF-5224: Update the order of upgrade plugins
Merge commit '9518a04026e63260f104062215b6736c4f47a03e' into HEAD