Fixes RTE .inputContainer being marked .state-changed even when it wasn't changed.
Merge branch 'release/2.2'
Adds cms:markerCount.