Merge "Fix pep8 violations in restlib.py"