ooici/coi-services — pull request #1640 by mmeisinger (2013-12-21 07:05:17+00:00)
Title: Fix accidental branch divergences

Fix some accidental divergences between the master and REL2.0 branch