BZ-9091: Correcting logic which determines when to display the "Portfolio No Longer Available" message.
BZ-9091: Code cleanup
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap