Periodic merge 20130717

* Revert "security-group: remove task that allow ARP to host node since default ebtable policies are ACCEPT."