Fix error referencing class that may not have been evaluated

Closes GH-121
refs #7860 - add puppetssh_wait setting

Fixes GH-124
Convert to metadata.json
Release 2.1.0