change the code to work with v2 VCAP_SERVICES format where the key and label field have no version number

find_by_label("github") will now match any of the following labels:

github
github-1.0
github-repo
github-repo-2
github-n/a

it will not match:
github1
github1-2.0