BUG-511: Remove CRLFs

Change-Id: I3110b88c70a90797cf699709761c04ab05b7124f
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 2aa2f94ab0d3682655ffd9975627d432036b57ed)
Merge "BUG-511: Remove CRLFs" into stable/hydrogen