Bug Fix
Merge remote-tracking branch 'origin/ctakes-service-java' into ctakes-service-java