LP#1454871: whitespace cleanup