Merge "resourceloader: Re-enable getVersionHash test"