Updated to reflect object model changes
Merge branch 'develop' into loadbalancer-serverstate