JERSEY-1555: works as desired. Tests addded.

	# On branch master
	# Changes to be committed:

Change-Id: I8af6cb75917059bab70672afba664458e6eb278e
JERSEY-1696: servlet-3-init-2 integration test is not invoked

 - fix + code cleanup

Change-Id: I4991ae734b4dd83062dd813baa9a3a9b63bd07aa
Merge "JERSEY-1555: works as desired. Tests addded."
Merge "JERSEY-1696: servlet-3-init-2 integration test is not invoked"