Changes for re-release of uSDLC2

Signed-off-by: Paul Marrington <paul@marrington.net>