JP Morgan raises its stock market forecast, sees a China trade deal and an easy Fed