Now that the show's over, I can post these --
These last two weren't part of the regular set of 17 -- They were for the special V.I.P. packages. Aayla was for the "Jedi Knight" badge and Mace was for the "Jedi Master" badge. You can read more about the V.I.P. packages over here.