Fixed functional tests
Merge branch 'master' of ubuntuserver:/opt/git/troubleticketMarionette