Remove develop-eggs, set slapos.cookbook versions
Remove develop-eggs and pin eggs versions
Merge branch 'trac'
Merge branch 'grid-computing'