Cherry pick from https://review.openstack.org/#/c/39122/

Synchronize www from master to stable/grizzly

Fix landing page/user guide

Change-Id: I201fbbe6be59faaea248b420fa05158e7f853e98
Merge "Cherry pick from https://review.openstack.org/#/c/39122/" into stable/grizzly