[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1867: Replaced locationManager bean references with annotations.