Change some BarrelEndcap5D occurrences to Pixel10D for the Extende2023Pixel scenario
Change some other occurrences of BarrelEndcap5D to Pixel10D
Change back to the BarrelEndcap5D version to two files which are common. Pixel10D doesn't have a copy.
Merge pull request #3214 from mark-grimes/fixExtendedPixel2023

Fix Extended2023Pixel