June 15 (Reuters) - U.S. and Iranian officials said on Sunday they have agreed on a deal to end their war, halt the U.S. blockade of Iran and reopen the Strait of Hormuz, possibly leading to lower energy prices once oil shipments resume through the critical waterway.