Fixes to eliminate autodoc errors coming with sphinx upgrade. Increase nova service timeout Change-Id: Id7c8dcb82b3529afdc22957239870e2a27cc6e1b