Merge branch 'stable'
* stable: (30 commits)
Clarify the upgrade instructions
Draft release notes for 2.1.5
documentation: Document why hook --change-url might be missing
documentation: Fix rendering errors in gerrit.config
Allow ; and & to seperate parameters in gitweb
Include a quick summary of the size of a change in email
Display the size of a patch (lines added/removed)
Fix clearing of topic during replace
Fix inherited Read Access +2 not inheriting
Add some basic RefControl tests for delegated ownership
Fix branch owner adding exclusive ACL
Optimize RegexFilePredicate for common matches
Correct copyright headers to AOSP
Don't expose /COMMIT_MSG as a modified file in ChangeData
Don't enable dk.brics.automaton's optional syntax
Fix NPE while matching file:^ pattern on deleted files
Fixed unused imports in OutgoingEmail
Don't show /COMMIT_MSG in change emails
Fix NPE during merge failure on new branch
Honor user's syntax coloring preference in unified view
...
Conflicts:
gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java
gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java
gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java
gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java
gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java
Change-Id: I80bfdb55872fa4bdf4f751c337b609e7ec809605
