Merge pull request #380 from danmcp/master

Merged by openshift-bot
Switch back to gp2 volumes