Merge proposals dependent on lp://qastaging/~thumper/launchpad/set-empty-review-type-as-none

1. set-empty-review-type-as-none
2. Dependent merge proposals