* stable-2.11:
Fix flaky test that relied on non-stable order of approvals
Update 2.11.4 release notes
Use uploader for approvals specified on push, not the committer
Fix "Conflicts With" when current change is a merge commit
Fix "Conflicts With" when other change is a merge-commit
UploadValidationListener: Fix minor typo in javadoc
Provide better detection of requiring sign-in
Update replication plugin
Submit: Fix ClassCastException for anonymous user
Note:
The testPushForMasterWithApprovalsForgeCommitterButNoForgeVote test is
broken due to refactoring that was done on the master branch since the
stable-2.11 branch was created. The breakage is not fixed in this merge,
but in the follow-up commit.
Change-Id: I52bdc55ecdf817c2d4ccf3a17e74cff6f53dfa60
70c62aa8f5