Merges foreign changes.

Incorporates (faye) changes: removes clientId, JSON2 and includes
SSL/CA. Several fixes.