Switch to using CompositeSubscription

- Start using CompositeSubscription
- Discard SubscriptionManager as obsolete
- Retain the unit test as a sanity check, failed with previous version of rxjava