Revert "Fix start-slave not passing instance number to spark-daemon."

This reverts commit a674d67c0aebb940e3b816e2307206115baec175.