Fixes for top-level pom use of 2021-09 target and doc pom

Change-Id: I7d1f7e9dd9d8f7054069d0b97cbe9a7067f6a470
2 files changed