Massachusetts marijuana tax could be up to 20 percent in lawmakers' new deal