[BUG #7179] moved 'sdk-server' job to tool/config.json
[BUG #7179] rm sdk-server from export list
[BUG #7180] minor code cleanup
minor adaptions
Merge remote branch 'origin/master'