fix all tests
Merge remote-tracking branch 'remotes/upstream/master' into 11548_added_new_functional
fix for travis and test config
fix codestyle
Merge pull request #63 from lensky84/11548_added_new_functional

11548 fix all tests