ooici/coi-services — pull request #1614 by carueda (2013-12-12 21:14:15+00:00)
Title: Adjust/revert some changes re OOIION-1495.

This is mainly while a more careful review by Maurice/Carlos/Edward is done. Several "TODO(OOIION-1495)" items added facilitate the review.