[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2714: A better and much faster (but still not perfect) definition and implementation of activity plan.