fix a unit test failure on ci server.
fix for issue 314, remove codehaus exception
Merge pull request #38 from gcheng/codehausbugfix

fix for issue 314, remove codehaus exception
Merge pull request #37 from gcheng/serviceruntimebug

fix a unit test failure on ci server.
Merge pull request #338 from gcheng/dev

Dev