Squashing 6054-1-faq into 6054-1, hope done properly.
Merge branch '6054-1' of github.com:openscholar/openscholar into 6054-1

Conflicts:
	openscholar/drupal-org.make
	openscholar/modules/os/modules/os_importer/os_importer.module