Using correct variable to test for dashlet existence.  Better conditional logic.  Fixes #8246
Merge branch 'dev' into test
Merge branch 'test' into prod