[PAXWEB-557] - DefaultJspMapping is not implemented in registerService
Merge branch 'master' of https://github.com/ops4j/org.ops4j.pax.web.git

Conflicts:
	itest/src/test/java/org/ops4j/pax/web/itest/WhiteboardIntegrationTest.java
	samples/whiteboard/src/main/java/org/ops4j/pax/web/extender/samples/whiteboard/internal/Activator.java