fix magit-get-next-branch, adding magit-rev-diff-count

This fixes #659.
magit-insert-diff: enforce short diff style for submodules

Fix #553.
Merge branch 'hotfix/submodule-diff' into maint
Merge branch 'maint'