Updated from global requirements

Also, revert commit 9826e0932596e77414b16b3c4ba237d847b30db1

Change-Id: Ibf423f14a5c37aa298b2115bfd4936f660c6f530
Remove last vestiges of nose

We don't use nose anymore, but it was still referenced in a few places.

Delete them.

Closes-Bug: 1210998
Change-Id: I5e00edd071b8e99e54cdbbf2de277aa95eb57567
Merge "Updated from global requirements"
Merge "Remove last vestiges of nose"