Merge pull request #288 from jcannava/emc_multipath

Merged automatically by jenkins after successful build test
Merge pull request #289 from jcannava/emc_multipath

Merged automatically by jenkins after successful build test
Clean up after jason
Merge pull request #291 from willkelly/grizzly

Merged automatically by jenkins after successful build test
changing multipath to enable_multipath in the nova provider