Make sure all parameters to argmaps have reasonable defaults.  Also
add missing canvas add to annotation manager.  Refs #2525

Change-Id: I622dc934fb43db736c9541207e0b0e969f9acf36