Squashed commit of the following:

commit 95c3adb49ea2a9831dbbe85d33a2b13c6781e860
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Thu Jan 31 12:10:29 2013 -0800

    beatrix: fix scanning bug in ServiceFinder

    In some situations, we were scanning the full filesystem to find
    KillbillServices. Add a safeguard - this should never happen.

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit bedb298fff6a4878b1fac0f68ab23b4e5173c518
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Thu Jan 31 12:03:55 2013 -0800

    osgi: fix pom versions after merge

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 9cb940f13f37ba513dbc04aabcbd2b0a5d6b44e4
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Thu Jan 31 11:01:05 2013 -0800

    meter: don't try to aggregate if aggregation is disabled

    It looks like we had the config parameter, but we never used it.

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 0b35e77019131b2c33e97d5bef54d3941d5a0d9f
Merge: d2053cc 28c7f38
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Wed Jan 30 17:38:15 2013 -0800

    Merge remote-tracking branch 'origin/master' into osgi

commit d2053cca60be431a0b7745ee06ab4b1238bef2b8
Merge: fe86eb0 af0f77a
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Tue Jan 29 17:24:04 2013 -0800

    Merge remote-tracking branch 'origin/master' into osgi

commit fe86eb0de2ee900cb66987b8dd5d98e6c4f6f4cd
Merge: 69b27cf 8c03f1c
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Tue Jan 29 17:22:23 2013 -0800

    Merge remote-tracking branch 'origin/master' into osgi

commit 69b27cf5114adb6fbfc0375b6a5a416f82770d4c
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Tue Jan 29 17:21:30 2013 -0800

    entitlement: fix tests group in EntitlementTestSuiteNoDB

    NoDB are fast tests.

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 16e5b8e70be1b396954307e3020c24760a4e48c1
Merge: 9077410 1ecc5db
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Tue Jan 29 17:19:55 2013 -0800

    Merge branch 'master' into osgi

    Conflicts:
    	beatrix/src/test/java/com/ning/billing/beatrix/integration/BeatrixIntegrationModule.java
    	pom.xml

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 9077410f2459e25c330359ccc233b989a551882c
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Fri Jan 18 17:26:08 2013 -0800

    osgi: jruby: fix require line when invoking the plugin

    Testing done: started up two bundles, one in Java and one in Ruby, and
    was able to print out external bus events from Killbill in both.

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 38b976954396e14c929b7303135381a25528cd16
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Fri Jan 18 16:15:02 2013 -0800

    osgi: remove extra dependency

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 22e6d927b141946d959548f49af6cc5e61f0f08f
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Fri Jan 18 16:11:54 2013 -0800

    osgi: jruby: simplify Activator

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit cf0bd02235e7ce514b2ca308a792c0066475ba63
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Fri Jan 18 15:46:48 2013 -0800

    osgi: second pass of cleanups

    * Refactored the build structure
    * Tested both hello and JRuby bundles under Felix and Equinox
    * Fixed the Java plugin discovery code

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 6d4ed539dea126d91d73a261252e4b449cb12269
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Fri Jan 18 14:32:20 2013 -0800

    travis: try a workaround to avoid timeouts

    Builds are stopped if no output has been received in the last 5 minutes.
    Since `mvn install --quiet -DskipTests=true' takes more than 5 minutes
    now, see if removing the --quiet flag solves our issues.

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 9f9ef5d98736862f0ba56e739020f3da745f88ef
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Fri Jan 18 14:24:44 2013 -0800

    osgi-jruby-bundle: first pass of cleanups

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit ca1a99b83bec62ea3d8894e890a16241e2a0964b
Author: stephane brossier <stephane@ning.com>
Date:   Thu Jan 17 10:44:56 2013 -0800

    Add config for java plugin

commit e0e7144f5bd2ce6668d6d83940966924581f62f9
Merge: a95335f 735fce7
Author: stephane brossier <stephane@ning.com>
Date:   Wed Jan 16 16:16:16 2013 -0800

    Merge branch 'osgi' of github.com:killbill/killbill into osgi

commit a95335fe2404d425b3e6d7aee7ca22a2d098c630
Author: stephane brossier <stephane@ning.com>
Date:   Wed Jan 16 16:15:44 2013 -0800

    Add osgi config for jruby pugins

commit 735fce7d890250325ad8eaac529def8457a995f3
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Wed Jan 16 13:27:09 2013 -0800

    orgi-jruby-bundle: install Killbill APIs

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit 53a05444890d6dfd5dc1523b2615f213414bce41
Author: Pierre-Alexandre Meyer <pierre@ning.com>
Date:   Wed Jan 16 11:58:45 2013 -0800

    Squashed commit of the osgi-jruby-bundle branch

    Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

commit e5307649a992075c4b71398893dc591bc68e946a
Author: stephane brossier <stephane@ning.com>
Date:   Wed Jan 16 11:34:38 2013 -0800

    Cleanup OSGI branch-- break initial example

commit 04f6abafda5be0156f510618731c8c53bfcca399
Author: stephane brossier <stephane@ning.com>
Date:   Tue Jan 15 19:38:46 2013 -0800

    Protoype work to test embedding OSGI within killbill

commit 5c931ae0a3b0b7179ad56331a063501d237f326d
Author: stephane brossier <stephane@ning.com>
Date:   Fri Jan 11 21:12:00 2013 -0800

    Toying with OSGI

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>