simplify/style-tweak/refactor conditionals in states.user, modules.{apt,file}
Merge pull request #4744 from hulu/conditionals-arbitrary-chunk

simplify/style-tweak/refactor conditionals in states.user,modules.{apt,file}