s3_upgrade: Update commandline options and use updated samba3 python module