Merge "Fix testGetCanonicalName PHPUnit test:"