fix OOIION-568: remove LJ01D_attr_2 in simulated network for platform LJ01D
update test to read port configuration from CFG object
Add cleanup to Scheduler quit
Fix for OOIION-619
Better on_quit - don't delete scheduled items from RR if restart
First attempt at pydap handler test
Extracted common greenlet cleanup method in SchedulerService
Better unit tests for pydap coverage handler
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Bumped pyon for extended resource framework
Bumped pyon
Fix RR service test - changed impl

Conflicts:
	ion/services/sa/observatory/test/test_observatory_util.py
referencing latest in pyon and coverage
Commented out code which was clipping users in extended marince facility
Merge branch 'master' into notification_preferences_digest_realtime
fixed test_notification_preferences. but test needs more work
got test_notification_preferences working
all tests working. put in code so that the batch emails get sent only with the appropriate notification preferences set
Added to test_process_batch(). Test working. Fixed a missing import