Fix cobbler sync issue

this also submits the differences between the folsom branch to the grizzly branch.