remove duplicate declaration
more strongly control behavior for dhcp-agent
Merge pull request #345 from xenolog/q_fix_ha_PR1

critical fix for manifest