Merge branch '7.1' into 8.0

# Conflicts:
#	core/.classpath
#	core/src/main/java/lucee/runtime/engine/Controler.java
#	loader/.classpath

Author: michaeloffner

core/src/main/java/lucee/runtime/type/dt/TimestampImpl.java

@@ -19,11 +19,12 @@
 package lucee.runtime.type.dt;
 
 import java.util.Date;
-import java.util.TimeZone;
+
+import lucee.runtime.PageContext;
 
 /**
- * DateTimeImpl for a value read from a JDBC DATE/TIME/TIMESTAMP column, preserving the driver's
- * own toString() representation instead of Lucee's {ts '...'} ODBC escape format - see LDEV-1344
+ * DateTimeImpl for a value read from a JDBC DATE/TIME/TIMESTAMP column, preserving the driver's own
+ * toString() representation instead of Lucee's {ts '...'} ODBC escape format - see LDEV-1344
  */
 public final class TimestampImpl extends DateTimeImpl {
 
@@ -37,7 +38,22 @@ public TimestampImpl(Date date, String jdbcToString) {
 	}
 
 	@Override
-	public String castToString(TimeZone tz) {
+	public String castToString(PageContext pc) {
+		return jdbcToString;
+	}
+
+	@Override
+	public String castToString(PageContext pc, String defaultValue) {
+		return jdbcToString;
+	}
+
+	@Override
+	public String castToString() {
+		return jdbcToString;
+	}
+
+	@Override
+	public String castToString(String defaultValue) {
 		return jdbcToString;
 	}
 }