Merge "Adding EJBCA configuration to Documentation"