Merge "[APPC-44] revert license line ending changes"