Bug 10691: (follow-up) restore behaviour for control field ($w)

Bug 10691: (follow-up) restore behaviour for control field ($w)

As noted by Jared, in the presence of 4XX$w or 5XX$w the display
got broken by this refactoring. This patch restores the previous
behaviour in that front.

The OPAC themes get fixed too, and the Bootstrap one gets this
fix too.

Applied the fix that Galen proposed on comment #30 regarding
Zeno's fix in bug 11174.

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 06ef9f11098405cd688f43af39d828a4eb674582)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>