Check for non-default volume name template.

The iscsi delete methods in iscsi.py had hard-coded volume names
'volume-%s'.

If a user configured volume_name_template to
something other than default the result is failure to remove
the iscsi_target.

volume create worked appropriately and created the correct name
in the DB, so the persistence files were the only thing affected
or named incorrectly.

Fixes bug: 1101071

Change-Id: Id5575874b2cebd9b3509d739cb92abf06c503c4e
(cherry picked from commit f02c575b4b28b69cade6c1c06dd772c62754fc9c)
Fix error for extra specs update with empty body.

Fixes: bug #1090320
Change-Id: Ia2792d477f7670ecb2eb0c9c10dcbf1cf5b2389e
(cherry picked from commit fee9b2ad61bb69d356e1280f0556afd808c5f128)
Merge "Check for non-default volume name template." into stable/folsom
Merge "Fix error for extra specs update with empty body." into stable/folsom