Add version qualifier awareness to resource resolution.

Closes #985, Fixes #724.