Modified command line behavior to handle label changes and possible conf...

...licts.  Changed password behavior to not require changes and not require typing password in the clear on the command line
Those can just be
if final_add_labels: