SPARK-1830 Deploy failover, Make Persistence engine and LeaderAgent Pluggable

Similarly, we can get rid of this `@return`; we don't need to use scaladoc to document the return value here and the blank documentation is ugly looking.