SPARK-2686 Add Length support to Spark SQL and HQL and Strlen support to SQL

Rolled back changes that somehow got in from other PR's