Initial commit.
Unregistering the servlet in stop() is not necessary, this already happens via the ServiceTracker when the bundle is stopped.
Resolve merge conflict.