Fix test.
Merge pull request #4018 from openscholar/2857-dev

@WIP update make file to use latest stable features 2.x version #2857