Maintenance

Replace last usage of hamcrest with assertj.
Added empty docType to context.xml to remove eclipse warnings.
Updated various dependencies.