BISERVER-8103: Refactor end time
Merge pull request #15 from pentaho-skarmali/biserver-8103

BISERVER-8103: Refactor end time