Fix PHOENIX-33 Support table-wildcard select in join queries
Fix merge conflicts
Fix test case failures
Fix parser compilation warnings