UT additions for agent/services
Merge pull request #392 from haripk/master

UT additions for agent/services
Mark mainline version to 1.1main
keystone port from config file
Merge pull request #394 from Juniper/keystone_port

keystone port info from config file
Merge remote-tracking branch 'github/master' into control_node_config_ini
No need to default to empty strings