Merge proposals dependent on lp://qastaging/~gerboland/unity-2d/dash-ratingstars-integer-selection-only

1. dash-ratingstars-integer-selection-only
2. Dependent merge proposals