Marriott agrees to contain mandatory resort charges in upfront pricing