Fix the array diff.

array_diff_assoc() reads like it first does an array_diff() (which
compares the values) followed by an array_diff_key()...  I'm not sure,
but I digress. In any case, the related section of code should not be
taking the values into consideration at all.
Merge remote-tracking branch 'origin/7.x' into 7.x-fix-array-diff

Conflicts:
	includes/admin.inc
Merge pull request #128 from adam-vessey/7.x-fix-array-diff

Fix the array diff.