Merge remote-tracking branch 'upstream/master'
Resolved the conflicts in the following files:
    include/locvec.h
    src/runtime/stream/entity/filter.c
    src/runtime/stream/utils/debug.c
    src/snet.mkf
Also cleaned up several warnings which were introduced by the lpel_hrc merge.
Also the SNetUtilDebugFatal nog longer seem to have variants with Task or Ent
since the lpel_hrc merge. This lead to other updates.