Merge "Remove apache tls-proxy sites when stopping"