REmove non Guicy base test classes from server module
Merge branch 'master' of github.com:killbill/killbill