rubocop fixes, and ubuntu serverspec fixes