Updated logic around choosing SMOKE and INTERNAL clusters to be more explicit (JIRA CLB-709)

Change-Id: I79d51458ceacf08b6aa167930d3044418e622e07