Merge "lshal: use FQName::parse"