Travis: add missing -J to memory options
Merge branch 'wip/havocp-from-1.2.x' into wip/havocp-merge-master