[0.17] move most extended tests to normal

[instagibbs]

This is what upstream master has, and helps not hide issues more.

[mword]

Moving tests from non-travis list to the travis list a good idea (from comments the --extended tests aren't run by travis). All functional tests pass for me both with and without --extended. As I write this, the travis tests are still "pending".

A few of the tests have changed "category" (in comments) - for example p2p_timeouts.py was under Tests less than 2m in the extended list and is now in the long test section (those above Tests less than 5m) in the base list. I don't know if this is intentional or important but it may be something to double check.

[instagibbs]

Yeah I kind of hap-hazardly threw them around, not sure it matters a lot. The one build appears to be timing out fairly regularly, but most likely unrelated.

[instagibbs]

trying a revert commit to see if that build is still timing out on its own

[instagibbs]

travis is pooping the bed on that build; I'm just going to ignore it for now.

[mword]

tACK - Not sure why Travis is having problems.