NetApp fix ssc volume filtering inconsistency

This fixes the situation when the actual netapp
volume data structure becomes inconsistent
because of operating on the actual object
than the copy of it. It also introduces some checks
before calculating volume stats.

Change-Id: I626f9ca9aa8c7cc41ba4aa6058f14cc040f7301f
Closes-Bug:#1243081
(cherry picked from commit 1d503937e841da27f5e3441775b2d208e44f5e75)
NetApp fix for 7mode iscsi volume stats

This fixes the bug for reporting correct
capacity information in case of 7mode
iscsi drivers.

Change-Id: Ie41009eca866830173809211d58470025be847e3
Closes-Bug: #1238967
(cherry picked from commit e4bde7adda4e885fe847e0bacc4d3fc84547e723)
Merge "NetApp fix for 7mode iscsi volume stats" into stable/havana
Merge "NetApp fix ssc volume filtering inconsistency" into stable/havana
Merge remote-tracking branch 'upstream/stable/havana' into stable/havana