Exclude servlet-api dependency

Resolves: https://www.pivotaltracker.com/story/show/70856506
Address Sonar critical warnings

- End this switch case with an unconditional break, continue, return or throw statement
- Use hasVersionLabel() instead of catching exception for version label check

Resolves: https://www.pivotaltracker.com/story/show/70584818