Model Changes for Infra State Machine Placement

https://bugzilla.redhat.com/show_bug.cgi?id=1129748

This is just the code changes in the CFME models