Merge branch 'master' of https://github.com/pantheon-systems/drops-7 into 7.x-1.0-beta18

Conflicts:
	modules/pantheon/pantheon_apachesolr/pantheon_apachesolr.info
Merge branch '7.x-1.0-beta18' of github.com:phase2/openpublic-drops-7 into 7.x-1.0-beta18

Conflicts:
	modules/pantheon/pantheon_apachesolr/pantheon_apachesolr.info