Re-seeding with Lindani's modifications

Change-Id: I88b3a79c26e9643527da2d0f2d6f8051b7be00fc
Signed-off-by: rexwhite <rexwhite@redhat.com>