Merge changes I6922253c,Iad7c595b

* changes:
  bug fixes
  wang2vec: factor out collocator- and rocksdb in makefile