Merge "Bug 548855 Update documentation wiki files"