4193 ls --color with filename arguments does not colorize
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
Merge branch 'master' into build