Merge "Revert "BUG-2613: Migrating Openflow Specific NSF from controller project...