Issue 433 - Made adjustments for $sitekey-related changes to the Matcher API
Backed out changeset: 57f5dbea9d24
Reverted backout of 57f5dbea9d24
Issue 1384 - Update adblockplus dependency to revision 7313f49c65e3
Issue 1385 - Update buildtools dependency to revision 361852d2ae36
Backed out changeset 5d21c1d80ecb (premature, going to break checkouts)
Issue 1325 - Use Shadow DOM if possible when highlighting page elements

--HG--
extra : rebase_source : f6cf4ecbc36cd85d24ba4f35fba43e51c9cf04ec
merged upstream