Well it looks like they have separated the Shapeshift Bar and the Pet Bar. Tested already with warlock and just now with Hunter.
Code:
ShapeshiftBarFrame
|__ ShapeshiftButton1
|__ ShapeshiftButton2
|__ etc
Shapeshift Bar for Warlocks contain the demon form button.
Shapeshift Bar for Hunters contain the Aspect buttons
PetActionBarFrame
|__ PetActionButton1
|__ PetActionButton2
|__ etc
The PetActionBar seems to be the same for both warlock and hunter pets and the buttons are interchangeable just like a regular action bar allowing you to customize the abilities you wish to have access to and possibly the ability to put macros on there as well.