Fix dependencies for ocata
Fix dependencies for ocata

The apicapi and python-opflex-agent dependencies are using
temporary branches to allow GBP to build for ocata. The master
branches on these dependencies have been updated, allowing GBP
to build using their master branch.

Change-Id: I4855c24fbf570e17aa4b13a44aee822cf1aebb41

noironetworks/group-based-policy,stackforge/group-based-policy,noironetworks/group-based-policy,stackforge/group-based-policy