Add sdata.o dependencies.
Silence some compile-time warnings.
Remove unused variables.
Perform a full swapout before removing upgrade templates.
Merge branch '1.4-stable'