Merge "[CONTRIB] Adjust EJBCA to issue certificates usable by servers."