Merge "Bug 2563 - Parser should fail when key statement does not reference leaf."