Wiki Markup around inline macros is not rendered in wysiwyg mode and therefore lost

See RNDR-85

Inline macros (those that can be placed inside a paragraph) are rendered as blocks in the wysiwyg editor. This breaks any paragraph level markup around them, such as style tags or links.

_foo {nolink:http://www.atlassian.com}nolink_

*foo {cheese} bar*

Will not display any bold in the RTE, and will not round-trip correctly. (Quick testing suggests that the round-tripping may not have worked for a while, as does CONF-15460, but it used to at least display correctly in the rte, and maintain some of the emphasis after round-trip.

I think it should be an easyish fix and think any side-effects of the fix will be less bad than the bug.

This bug is a superset of CONF-15853