Drupal7 upgrade and api changes

Squashed commit of the following:

commit 6ad519decf032c59a729d92a47514c7a22a47141
Author: Adam Roses Wight <awight@wikimedia.org>
Date:   Tue Apr 16 17:07:41 2013 -0700

    fixes after d7 work

    Change-Id: I1bd7e5b5adb5cf0000e602a5e51cfa8314229827

commit ecc97f9e468d010819af8e7421468364d37903ad
Author: Adam Roses Wight <awight@wikimedia.org>
Date:   Tue Apr 16 17:05:43 2013 -0700

    Recurring tests to validate db api refactoring

    Change-Id: I7889b41c5ade8cd7235bece3ae0f8bc3cdd8b701

commit 143c727d5a11e9540301166a5ad4460bafaef664
Author: Adam Roses Wight <awight@wikimedia.org>
Date:   Mon Apr 15 17:41:24 2013 -0700

    d7, config links

    Change-Id: I4adc1983dfbe3e54f687cb0378ead784769aee78
    TODO: new menu block in admin/config

commit 3ffed71df6ce96d8b075487b05ba9eedc4969d35
Author: Adam Roses Wight <awight@wikimedia.org>
Date:   Mon Apr 15 12:35:55 2013 -0700

    more d7

    Change-Id: I15ca90d6d6847b0b868bb49b30462a2b05fae107

commit ae433b087618e0a670b572a3f4ea5312ab9dfe05
Author: Adam Roses Wight <awight@wikimedia.org>
Date:   Mon Apr 15 12:20:46 2013 -0700

    d7 api changes and submodule branches

    Change-Id: Ie874b0f7b74f00d1ea9adb37b61f504655c708c2

Change-Id: I0b70172eae1a801a88d7f8331904050a168ec34a