Copy back the original kwargs into the monitor catalog call args

[jeanconn]

Description

Copy back the original kwargs into the monitor catalog call args

The ACACatalogTable object should have the original arguments and not any arguments that were used just to determine if the monitor window should be a MON or a guide-from-mon, and this change assures that.

Testing

• Passes unit tests on linux
• Functional testing - new test added in Test that roll options work without error on a specific monitor cat sparkles#156

Fixes #364

[jeanconn]

I don't see any reason that the catalog needs to have the "as solved-for" monitor kwargs instead of the original ones, but if there is another driver for the way this code was working, @taldcroft can speak to it. I also figure he may want to go with a different fix strategy, but this fix can be tested to at least see if I have the scope correctly isolated.

[taldcroft]

Looks good, but just move each of the lines setting the kwargs to be immediately after the line where the catalog is created. That makes the code localized. Also add a comment like # Needed for roll optimization, see #364 in each case.

[taldcroft]

Approved, assuming this has been tested with the new sparkles test.

[jeanconn]

I confirm this was re-tested with the new sparkles test.