With contentious change removed, Trumbull council OKs charter revisions