This fixes some of the old links to classes that have been moved, or split, fixes some of the sphinx warnings that were being output and cleans up the reference to deprecated properties. Change-Id: Ib930c54bcdf15876093cbe5b6527a195b9594f40