Stop forcing plot selections to be integers (Issue 20115)
Clear measure choices when cleared from filter panel.
  - aka Issue 20138: Clearing "in the plot" filter should also clear x and y variable dropdowns
  - Updated test to check for this case.
  - This change also requires a change to SVN trunk, make sure you sync with that first.
Merge branch 'bugfixes' into develop