New methods for Sqoop import with SQL query

Good point Vineeth. We might not do this consistently (e.g. I'd need to double check the upload tests), but if not we should.