Make changes requested for review.

Introduces a while loop for invalid argument entry rather than just moving on.
Adjust the input prompt to be more in line with existing rose CLI prompts.
Make the get_user_values public as used by upgrade.py not just macro.py.