going back to salt version 1.1.6 in order to prepare for ANNIS release
further minimizing the use of sfeatures also for edges, also fixing some test cases