API fix and rebase fix

Signed-off-by: Derek Collison <derek@nats.io>

server/jetstream.go

@@ -120,8 +120,8 @@ const (
 
 	// JsObservableInfo is for obtaining general information about an observable.
 	// Will return JSON response.
-	JetStreamObservableInfo = "$JS.OBS.INFO"
-	jsObservableInfoExport  = "$JS.*.OBS.INFO"
+	JetStreamObservableInfo = "$JS.OBSERVABLE.INFO"
+	jsObservableInfoExport  = "$JS.*.OBSERVABLE.INFO"
 
 	// JetStreamDeleteObservable is the endpoint to delete observables.
 	// Will return +OK on success and -ERR on failure.

server/server.go

@@ -890,7 +890,6 @@ func (s *Server) setSystemAccount(acc *Account) error {
 	}
 	acc.mu.Unlock()
 
-	now := time.Now()
 	s.sys = &internal{
 		account: acc,
 		client:  s.createInternalSystemClient(),