Fix unknown constant error

When the binstubs command loads, cli/common is not loaded which causes it to error out when a gem is not present
Merge pull request #3095 from jetaggart/1-6-stable

Fix unknown constant error