Merge "Bug 773: SimpleForwardingImpl hits NPE when .frm member is null and new host...