added more asserts to
StackingFutureSubscriptionWithCurrentSubscription() test
accidently committed code that was temporarily commented out
Merge branch 'master' of github.com:RedHatQE/rhsm-qe