Fix and assert calls to update_software_deployment

Some calls to update_software_deployment had incorrect arguments.
This change fixes those calls and also asserts call arguments
in test_software_deployment.

Change-Id: I5a2b8a10fd7be6e9728d28b1894067f07102dad9
Merge "Fix and assert calls to update_software_deployment"