Issue 237 odsm dkan

DONT PULL THIS DIRECTLY!

Once this passes QA we need to remove the  ccfb6b0