This one and the former were good ideas, but:

o They only affected a very small percentage of the actual code, and
o Reviewing changes is best done in the config.xml, not the revision message.

(cherry picked from commit 808a2604)

(cherry picked from commit 31293e66)

(cherry picked from commit 19c90f70)

(cherry picked from commit e346cead)

We moved past a critical section with 15.7.18, so this no longer
has any operational value.  :)

(cherry picked from commit a1e44cc6)

(cherry picked from commit 2a60c252)

(cherry picked from commit c92a65c1)

(cherry picked from commit 734c3cd7)

(cherry picked from commit bbaccbb3)

(cherry picked from commit c4354331)

(cherry picked from commit 7e5ff770)

(cherry picked from commit 2b098ba9)

(cherry picked from commit b40a2e8a)

(Already had issues in the code that were obvious, some may still
linger in there.  Also uselessly confuses our dedicated translators.)

(cherry picked from commit 50d01bec)

(cherry picked from commit e369c686)

(cherry picked from commit 38f5c056)

(cherry picked from commit 93e50c3f)

(cherry picked from commit c6880a24)

(cherry picked from commit 4a8b6cae)

(cherry picked from commit 353f9e22)

(cherry picked from commit 91a6e982)

Spotted by: @fabianfrz

(cherry picked from commit 1b03f583)

(cherry picked from commit 45f297ad)

(cherry picked from commit 1961849d)

(cherry picked from commit 162fdcb2)

(cherry picked from commit b06b01a0)

(cherry picked from commit 94e16143)

(cherry picked from commit 1f5b8fa0)

(cherry picked from commit b383bdd4)

(cherry picked from commit 94a2da60)

(legacy, ipsec) fix ipsec diag page, connect to vici, drop smp support, add privilege separation using configd

(cherry picked from commit 5dcae9cf)

(cherry picked from commit 5f34f72c)

(cherry picked from commit 92948294)