Merge proposals dependent on lp:~0x44/agent-smith/script_changes_for_testing

lp:~0x44/agent-smith/script_changes_for_testing has no merge proposals.