Merge "Add cleanup stage to 'nginx' role test"