remove linebreaks and add key/value for WEB-8850 +review WEBCR-186