Fix file manager doesn't display 'select' button when needed (also better suited to tinymce implementation) [#1111 state:resolved]
(cherry picked from commit f439272)
Tweaks to html editor controls to work w/ master repo [#1111 state:resolved]