Fix display name change during backup restore

Currently the display name and description of the target volume
is changed to that in the backup meta-data during backup restore.
This can confuse the end-user, especially in the case of restore
to an existing volume. This patch removes display name and display
description from the list of fields to be copied from the backup
meta-data to update the volume.

Change-Id: I21a0505352ddc8db801f4820d575399a4771b259
Closes-Bug: #1376194
Correct the message string

Change %(volumeid) to %(volumeid)s in message string.

Change-Id: Ia780a8687a784a6d8d8f0c5e6fe9b1a884416608
Closes-Bug: #1381464
NetApp fix to set non default server port in api

The non default netapp_server_port config option was not
getting set in api even if specified in cinder.conf. Its
made non mandatory and set if specified in the configuration.

Change-Id: I62943427e0caac2742cce4ce56c1a49917f9210d
Closes-bug: #1322379
Updated from global requirements

Change-Id: I8ad37eb2e149aa1bb51ec71988e8dbbf6243118e
IBM Storwize driver: Add local variable assignment to "ctxt"

* The method get_vdisk_params in helpers.py is missing a local variable
assignment for "ctxt", causing "UnboundLocalError: local variable
'ctxt' referenced before assignment. Adding the assignment should
resolve this issue.

* Add the unit tests coverage for get_vdisk_params.

Change-Id: I564b1ef8cd1b6504d5ac8c9af0bb11bf29767d9a
closes-bug: #1379654
Merge "NetApp fix to set non default server port in api"
Merge "Correct the message string"
Merge "IBM Storwize driver: Add local variable assignment to "ctxt""
Merge "Updated from global requirements"
Merge "Fix display name change during backup restore"