JSPACE-82 clean up of OAI. Merge OAI branch into master. Rewrite of Request.