Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com> [yann.morin.1998@free.fr: - s/release branch/maintenance branch/ - extend the master-then-backport section - slight eye-candy on the rest ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 76ed69499d63ffb1e9167d36d794ebda6b17cd1a) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>