Bug 540362: [webkit-composer] Use webkit for composer

Merge wip/webkit-composer branch into master.