Merge remote branch 'public/master' into periodic-merge-20130701
Merge pull request #434 from axsh/periodic-merge-20130701

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

This reverts commit 45ec5cceba322794a0383c2aeebdfc00b97c1d2a.
Merge pull request #446 from axsh/fix-metadata-server

Revert "security-group: remove task that allow ARP to host node since de...
Merge remote branch 'public/master' into periodic-merge-20130717
Merge pull request #449 from axsh/periodic-merge-20130717

Periodic merge 20130717
Merge remote branch 'axsh/master' into periodic-merge-20130717
Merge pull request #227 from axsh/periodic-merge-20130717

Periodic merge 20130717