Merge changes from origin/7.1

f4fa4e8 Normalize line endings

Change-Id: I48ccf40262eb600b4cbc45e49abb5d5a6258b2db

diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
Simple merge