Delete bay rather then container when requested

The bay delete code was deleting a container when it should be deleting
a bay.

Change-Id: Ia49e72096254ba274ddadda71f0fc7fa6091ac6b