JPMorgan upgrades emerging market equities as Sino-US trade war eases