Add TODO to remove Ubuntu-10.04 fix on end of support
Fix rubocop warnings