Fix C.F.O.P editor

* Fix a test that broke after kiwi changes
* Fix description starting with a " " on the editor

Change-Id: I68a5ad8953759ad23646a8fcb0c96dee10931ea6
(cherry picked from commit d9733702844987064451b183fa29fe3df5dfb5f1)