Update Conditional Fields

The conditional fields module revision that is specified in the OA Core makefile is out of date, and many of the patches that are referenced have been merged into the official release.

Additionally, the included version of the patch referenced here breaks features exports when exporting multiple definitions that reference the same bundle: #2362507: Features integration: Key export by option
The version of the patch that was merged includes an index to prevent this issue.

Patch to OA Core makefile incoming. This update will require any submodules in OA that use conditional fields to be re-exported, and any alters that are done on the array keys to be updated accordingly (not sure if this is being done anywhere, but hfox mentioned it in the above referenced thread).