Merge change 20890 into donut

* changes:
  Checking in frame-work for new Open source site