add composer.lock

Change-Id: I4f62b2c14a1e737365afd3aa82ea30b931424f8c
Merge remote-tracking branch 'upstream/master'