Upversion jbt-server repo for next master
rebase against master new version
Update new test plugins / itests with new master version