Include new patch to OG per #2019057: Enabling og_access causes an exception when rebuilding node access permissions