Fix concatenation in firewall related actions

Remove concatenation and pluralization issues from firewall
Rules, Policies, and Link actions.

Change-Id: I7e00d2d56d22eddcc973ea325dc6d49ba1beb797
partial-bug: 1307476
Merge "Fix concatenation in firewall related actions"