[CB-3962] fix inline text in upgrading sections; add more vertical space in listings