HH-43534 changes for tornado3 upgrade
HH-43534 remove apps option