cleanup and CHANGELOG for eb0a9cafeba0828d93281154a8f933c99f9d1461, refs #886