BCL proxies cleaned up and update for last JSIL changes.

--HG--
extra : source : a606c3916eae40d19a64ef596d090dbffd1bc91e
Merge