26887 Add shield and permissions
Merge branch '7.x-2.x' into 26887-shield

Conflicts:
	agov.install
Merge pull request #279 from previousnext/26887-shield

26887 Add shield and permissions