Revert "deprecate resource match API"

This reverts commit 982469003a1375683f01b2a9f0d22beebb13310e.

Conflicts:
	src/cf/api/application_bits_test.go