Add patch to OG-vocab to fix WSOD when altering the form, and moving an OG vocabulary field

#4403