Bug 899969: Use mapper to ensure gaia revisions are consistent. r=aki