Updating an import on a release branch breaks future master updates

The basehash calculation finds the release import and triggers conflicts when merging into master's copy of the import. Not sure how best to fix this.

Cc: @brad.king