PHOENIX-76 Fix perf regression due to PHOENIX-29 (JamesTaylor)
PHOENIX-99 Automatic white list based upgrade from 2.2 to 3.0 (JamesTaylor)