Merge "idmap: include idmap version in check for stale file"