temporarily disabling test because of intermittent failures
Merge branch 'master' into develop

* master:
  temporarily disabling test because of intermittent failures