added back the striping of leading and trailing single/double quote and added support for hivevar