Bug 1018284 - changes required for scl1 Move Train B. r=pmoore