* Add more strict rxjs lint rules and get rid of rxjs 5 usages

* Use proper naming suffix for private var

* Fix conflicts