Fixed search for rocksdb under ubuntu 12 and 14
Merge remote-tracking branch 'origin/development'