Updates for MAEC 4.1

Updates for MAEC 4.1, mostly minor and relating to new ID generation.