This gets the oa_messages feature out of its overridden state.
Reverting the field instances for daily and weekly digest.
Merge remote-tracking branch 'origin/oa_messages-overridden-fix' into 7.x-2.x