add pivotal specific properties
Merge branch 'consolidate-login-servers' into consolidate-login-servers-working