[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5772: Removed dhis-service-options project, merged its remaining content into dhis-service-core.