Merge changes from topic 'fsconfig2-fixups'

* changes:
  fsconfig: fix pylint warning
  fsconfig: fix style formating with yapf