Squashed commit of the following:

commit 0820663adab82636676df797afaa8102f11f38fe
Author: Lance Speelmon <lance@speelmon.com>
Date:   Thu Jun 21 15:36:35 2012 -0700

    Backout cherry-pick for bundles/meservice; now matches origin/develop; i.e. prior to cherry-pick

commit 52de80e47a90ade3295d8abd23ae75faad7ad119
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Jun 19 16:25:16 2012 -0700

    KERN-2922 integration tests failing: basiclti-test.rb
    (cherry picked from commit a83fd4c4ca05fc7d4090a6e5ba7b587b7310c448)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit a22676815204d903edbb3a64290c1dad8ef0abee
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Jun 6 15:14:56 2012 -0700

    KERN-2889 fixed a bug if offset calculation - now in hours as expected
    Extract reusable locale and timezone logic from LiteMeServlet
    (cherry picked from commit 8497fee8ebddb831d2acf5887505a734e73c7e65)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit 75519c8263f3b68ec0a400b9b5b8aabfff793bc9
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Jun 6 15:13:29 2012 -0700

    KERN-2895 Update binding to basiclti-util and refactor locale and timezone to be more standards compliant
    (cherry picked from commit 490942ce9dd5b8f07e037b5396138753d7debeb1)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit 173372517af841fdd95a71e1990981fea88be7a9
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Jun 6 13:54:08 2012 -0700

    KERN-2895 Update binding to basiclti-util and refactor locale and timezone to be more standards compliant
    (cherry picked from commit 038aab56928cb6433d41ae906d1c10749064a695)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit 6f6fcbd74b57ba1affdd9fba46d93645c45179b9
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Jun 6 14:28:32 2012 -0700

    KERN-2889 fixed missing export package in utils. Caused meservice bundle to not start.
    Extract reusable locale and timezone logic from LiteMeServlet
    (cherry picked from commit 9f4e046a4a244baf5fbf1619e447150fa372ae94)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit 22b3e187a807388710bb395a438af0be43247349
Author: Lance Speelmon <lance@speelmon.com>
Date:   Wed Jun 6 10:34:17 2012 -0700

    KERN-2890 Add test coverage for timezone and locale support to LTI consumer launch payloads
    (cherry picked from commit 5bc95c2af1d359bf4bd49e4aab9f0c97df6028ed)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit d157b1c334118a5e9ef089a7fb0a43e5ffb7be03
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Jun 5 15:46:00 2012 -0700

    KERN-2889 Extract reusable locale and timezone logic from LiteMeServlet
    KERN-2890 Add timezone and locale support to LTI consumer launch payloads
    (cherry picked from commit 22a21f7f884cf1ea734f5e26eaa4d6be2d9a876e)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit d3cfb833602fcecdc15e989864734fa180d5d585
Author: Lance Speelmon <lance@speelmon.com>
Date:   Tue Jun 5 15:25:32 2012 -0700

    KERN-2889 Extract reusable locale and timezone logic from LiteMeServlet
    KERN-2890 Add timezone and locale support to LTI consumer launch payloads
    (cherry picked from commit b80a8723c448ad2af44a6028d1a6c99f818c6698)

    Conflicts:
    	bundles/meservice/src/main/java/org/sakaiproject/nakamura/meservice/LiteMeServlet.java

commit d8f234f1db1c60b8f02fa25fc7d2d9ee92d5254c
Author: Lance Speelmon <lance@speelmon.com>
Date:   Mon Jun 4 19:56:11 2012 -0700

    Squashed commit of the following:

    commit b394ad113bb24a9c0b08dfd841efb2d5ef79918a
    Author: Lance Speelmon <lance@speelmon.com>
    Date:   Mon Jun 4 19:53:25 2012 -0700

        KERN-2866 Add coverage for LiteBasicLTIConsumerServlet and remove unused code.

    commit 2e2d1479ba89dbb9af267ffe1f69c9e61bf31d40
    Author: Lance Speelmon <lance@speelmon.com>
    Date:   Tue May 29 17:00:11 2012 -0700

        KERN-2866 Add full coverge for LiteBasicLTIPostOperation#doRun method.

    commit ffa6dffcd28b6edd4b3387147fa8429ba0197d9e
    Author: Lance Speelmon <lance@speelmon.com>
    Date:   Fri May 25 14:25:28 2012 -0700

        KERN-2866 full coverge for LiteBasicLTIPostOperation#createSensitiveNode method.

    commit eb235794a5ee88f262d2466fdb2593bb220bb466
    Author: Lance Speelmon <lance@speelmon.com>
    Date:   Fri May 25 08:51:25 2012 -0700

        KERN-2866 Add coverage for LiteBasicLTIServletUtils

    commit 5cf05f50c179153e983e1093fa507c19101ece9b
    Author: Lance Speelmon <lance@speelmon.com>
    Date:   Fri May 25 08:05:17 2012 -0700

        KERN-2866 Added coverage for BasicLTICLEToolPropertyServletTest

    commit 0655c7f227cf22dc57e271014d926d7484ac0f1c
    Author: Lance Speelmon <lance@speelmon.com>
    Date:   Thu May 24 16:43:04 2012 -0700

        KERN-2866 100% coverage for CLEVirtualToolDataProvider.
    (cherry picked from commit f41ce8232d130023d2d73e9be608a7598b19ebd3)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>