Revert "Merge "HP3PAR extra-specs key fix"

This should not have been merged back to stable/grizzly as the bug
fix was only checked into the trunk(havana) branch.

This reverts commit 872beece8fe8a3d7eb9ed67fcc207a90dad28028, reversing
changes made to 789b789b443505edf8b9fe9096ba22609a7f2250.

Change-Id: I5594b9b109c604d9a7d85ad5cb9aa2708699de4c