Move legacy pre-ESN notifications to ESN [NO RELEASE -1.18]

This hopefully *should* work, except this is mostly here for review-only currently, no merge.
Other people testing this would be nice too.