Include "bundle" property with FPP entity content types

I'm also needing the FPP entity bundles while using hook_ctools_content_subtype_alter(). Returning $info['bundle'] does break things (i.e. none of my FPP entities print in panels). If the 'bundle' namespace is already being used, then let's use something else like 'fpp_bundle'.

I think the underlying issue is in fieldable_panels_panes_load_from_subtype():

  // This means we're probably in the process of creating a new one.
  if (isset($subtype_info['bundle'])) {
    return fieldable_panels_panes_create(array('bundle' => $subtype_info['bundle']));
  }

When we set $info['bundle'], fieldable_panels_panes_load_from_subtype() thinks this is a new entity. Instead, let's check if $subtype_info['entity_id'] is set. If it's not set, then we're dealing with a new entity.

  if (!isset($subtype_info['entity_id'])) {
    return fieldable_panels_panes_create(array('bundle' => $subtype_info['bundle']));
  }

With this change, we'll never get to "Finally, try this" because either $subtype_info['entity_id'] is set or it isn't set. One of the IFs will return true before getting to "Finally, try this". I'm not sure about the consequences of this. When would neither $subtype_info['bundle'] nor $subtype_info['entity_id'] be set?

  // This means we're probably in the process of creating a new one.
  if (!isset($subtype_info['entity_id'])) {
    return fieldable_panels_panes_create(array('bundle' => $subtype_info['bundle']));
  }

  // And try it this way.
  if (isset($subtype_info['entity_id'])) {
    return fieldable_panels_panes_load_from_subtype_force($subtype_info['entity_id']);
  }

  // Finally, try this:
  return fieldable_panels_panes_load_from_subtype_force($subtype_name);

Committed. Thank you both!