Updating OF10 actions to appropriate OF13 actions

Change-Id: I0ededed5faab61aa615e5fb283dcfc3c2e6f2195
Signed-off-by: Peter Gubka <pgubka@cisco.com>
(cherry picked from commit 4b986255989110061ba15cdd3fc040869004a164)

Change-Id: I733bbcd822a5fec0cf2aa407143b711626b70856
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Merge "Updating OF10 actions to appropriate OF13 actions" into stable/helium