Servlet should be provided.
Clear some warnings.
Synchronize build options with develop branches.