Adds svc-map to cinder elements

This patch changes the use of map-services to svc-map for the
cinder-tgt and cinder-volume elements.

Change-Id: I58da499d723957534d022112e261e20bff0c9e67
Remove vif_plugging workaround

Now that I1889662f74a8da8c4ccfc46f0ccf8e73e9acb74b
has merged this is no longer necessary.

Change-Id: Ifa92b39b2a9fd198234da7e9302bdce8f7d99029
Merge "Adds svc-map to cinder elements"
Merge "Remove vif_plugging workaround"