Travis tweaks

2 quick changes:
- retry tests if they fail to help work-around false-negatives. Closes #4923
- Use DEBUG_LOCKORDER for one test

There's also a little fixup for depends necessary to get the flags setup correctly.