417561 Refactor annotation related code

Rename and refactor ServletContainerInitializerListener