SERVER-7175: only use matched field when found
SERVER-7175: allow enabling new update framework at runtime