Fixes https://github.com/lightblue-platform/lightblue-core/issues/116

Re-submittal of fix for https://github.com/lightblue-platform/lightblue-core/issues/116

This PR depends on https://github.com/lightblue-platform/lightblue-core/pull/257