Merged ericbottard-XD-709-710-711 - added task scheduler to batch and modified module-common.xml after rebase