always call resolveResourceVersions() so that URLs are made during Xbuild=demand
Merge remote-tracking branch 'origin/rs-tweak' into rs-tweak