Default template: image alignment

As an editor, I want to be able to align an embedded photo to right or left and have the content to wrap around no matter what template I use. 

Eg: Default template: https://dev.p4.greenpeace.org/international/2017-annual-report/

Evergreen template: https://dev.p4.greenpeace.org/international/annual-report-evergreen-template/ 

---------
When adding an image to the page content and selecting the option to wrap text around it, the text is not displayed properly on the front end.
See image "wrap_image.png" to see the option selected by user and see "wrap_image_endresult.png" to see what the end result is. User expects the text to wrap the image completely and not add extra spaces.

URL: https://master.k8s.p4.greenpeace.org/canada/en/about-us/
https://jira.greenpeace.org/secure/attachment/26333/wrap_image_endresult.png
https://jira.greenpeace.org/secure/attachment/26332/wrap_image.png