FAB-12610 #done

Change-Id: If71efa93555adb3445945c0324acfda4cc262974
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>