Conflicts:
doc/arm/notes.xml
(cherry picked from commit b947e1a521)
Conflicts:
CHANGES
bin/tests/system/conf.sh.in
Conflicts:
doc/arm/notes.xml
(cherry picked from commit b947e1a521)
Conflicts:
CHANGES
bin/tests/system/conf.sh.in