LOS ANGELES — A proposal to bring a Trader Joe’s and West Marine to a boating-themed waterfront area in Marina