Remove type and image_id replace with baymodel_id

The baymodel_id represents the bay model used to generate this
particular Bay.  This is essentially a split of Bay into multiple
objects - one for template storage - one for instantation.

Change-Id: Ie6b7220bfecfd61af0ecf9114a791dfed61b415e
Merge "Remove type and image_id replace with baymodel_id"