Track 4.3 branch for external/doclava from PA