Merge "[CONTRIB] Update ejbca to the newest version"