remove the word "keypair" from resource labels and test warnings
Merge remote-tracking branch 'upstream/develop' into develop
added checks for detach and create volume tests
Merge pull request #116 from daniellemayne/develop

Develop: 	added checks for detach and create volume tests + removed "keypair" copy/paste error