Fix concatenation in firewall related actions

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

Change-Id: I7e00d2d56d22eddcc973ea325dc6d49ba1beb797
partial-bug: 1307476
Fix concatenation in Volume related actions

Fix concatenation and pluralization issues for Volume,
Volume Type, Volume Snapshot, Extra Spec and QoS Specs
related actions.

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