Resolves DEFECT D-01244: Ensure all modals close properly with cancel or top right x.
Several of the modals had cut and paste type errors with references to modal close and reset methods that were not available in their current scope. These were changed to use the more general closeModal method.
Coverage remained the same at 33.407% when pulling a26418bf49f3bea8fc1225491350fbd07d852985 on D-01244-closing-modals into 62c58d0c8cc49f164ff7a24f47d433b7457e5acb on master.
Resolves DEFECT D-01244: Ensure all modals close properly with cancel or top right x.
Several of the modals had cut and paste type errors with references to modal close and reset methods that were not available in their current scope. These were changed to use the more general closeModal method.