LPS-33904

These changes will also retain Ray's inclusion of CounterLocalService and ResourceLocalService.  I'm assuming that this is required, but if it's not, let me know and I can gete as part of the processing.