Merge changes I52c33d1d,I162e4119

* changes:
  Update fProxy keystore
  Update Babel image to latest STAGING