Polished as per made suggestions on CAMEL-7023 which applies for the camel-guice-plugin as well.
Upgraded to AHC 1.7.21.