Fix Docker tag for branches

No '-' suffix for non-default branches
3 jobs for master in 1 minute and 59 seconds (queued for 10 seconds)