small fixes
Merge pull request #203 from Ranjith15/master

No Prorata BillingRule
Merge pull request #204 from Rakeshadlagatta/master

small fixes
..
Merge remote-tracking branch 'upstream/master'