The measurement timeout now can be set by a nettest
PEP8 cleanup
Merge branch 'feature/12919'

* feature/12919:
  PEP8 cleanup
  The measurement timeout now can be set by a nettest