Merge branch 'RELEASE-3_1' into temp

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/util/config_edit.py
	sics/site_ansto/instrument/util/gen_sct.py

site_ansto/instrument/TEST_SICS/fakeGalil/galilmotor.py

@@ -236,6 +236,8 @@ class GalilMotor(object):
             self.accel = max(1, abs(int(arg)))
         elif cmd == "DC":
             self.decel = max(1, abs(int(arg)))
+        elif cmd == "DP":
+            self.currentSteps = int(arg)
         else:
             print "Unknown assignment", cmd, arg