Separated pay types per server (bug 840768)
IA changes for devhub build section (bug 839666)