Fix potential intermittent failures related to configuration synchronization
Code clean-up
Removed linewrapping in config test util
Merge branch 'config-intermittent-fail'

* config-intermittent-fail:
  Removed linewrapping in config test util
  Code clean-up
  Fix potential intermittent failures related to configuration synchronization