Reverting fix for bug 973718
 - instead of not returning the broken apps, we are relying on the CLI/console resilience to handle these broken apps for now
fix bz977519 - for cases where v2 parsing succeeds but broker manifest parsing fails
Merge pull request #2933 from abhgupta/stage_973718_revert

Merged by openshift-bot
Merge pull request #2937 from rajatchopra/stg_hotfix

Merged by openshift-bot