UPSTREAM: <carry>: address review comments through addl prompts

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

Author: rashmigottipati