Bug 1083839: Report warnings when non-existing entities requested, fix auto-merge. r=stas