FAB-12717 #done
FAB-12720 #done

Change-Id: I29da1e50a46edf7e889c12709012cdcb63f949ef
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>