refs #5538; + mandatory fields
Merge branch 'poller.configuration'