Merge proposals dependent on lp://staging/~elachuni/rnr-server/null-reviewmoderationflag-user

1. null-reviewmoderationflag-user
2. Dependent merge proposals