fix various confict that appear for merging to master - #149

fix various confict that appear for merging to master#149

xsalefter wants to merge 14 commits into

joda-removalkillbill/killbill-client-java:joda-removalfrom

joda-removal-fixkillbill/killbill-client-java:joda-removal-fixCopy head branch name to clipboard