Fix broken unit test. Ignore webapp client integration test.
Merge remote-tracking branch 'origin/master'