The Long-Term Productivity of Hens Housed in Battery Cages and an Aviary