clean up control-tile reference issue in warehouse storage-block when no
control tile is present
Merge branch 'master' into import_table_models