Ticket0551: Offline manager creating duplicate on Put error
Clean up for Ticket0551
Merge branch 'Ticket0551'