Fix invalid variable references in UniFi & TfL#21

clarkd merged 3 commits intomainsquaredup/plugins:mainfrom

work/dc/variable-refsquaredup/plugins:work/dc/variable-refCopy head branch name to clipboard