NXP-13555: add missing dependency on javax.servlet:javax.servlet-api; remove duplicate on hibernate-core