Nsls2 3.3.x

Merging the nsls2 branch which has logbook and shift development.