Trebuchet : Avoid upgrade paths if ALL_APPS button

Change-Id: I0632760f7c5869940711e711114177cc3e576453
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0