[blivet:master/rhel7] Pylint inspired cleanup (#1070115)