CDB-2134 #fixes Fixes specs
Reduces timeout
Merge remote-tracking branch 'origin/CDB-2134'
updated jasmine runner to give useful information in travis