Add fowards/backwords compatability defines

Also remove duplicate define.
PS2: Re-Add define

Change-Id: Ie1950953d26d218775eb6c0d2fbd8ed525bb7949
Clean up wipe.c

Move around logic of wipe.c to better handle secure discard

Change-Id: I8ad3d2765713f4225536728654f88697a76aab1b