Merge branch 'stable-2.10' into stable-2.11
* stable-2.10:
Fix NullPointerException when executing query with --comments option
ChangeControl: Optimize creation by not re-reading changes
Conflicts:
gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java
gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
Change-Id: Id2098e90c2c19d36d86585b39249c1ca75590641
