Merge "[CONTRIB] Fix EJBCA configuration"