Merge pull request #109 from naveenhooda2000/develop

fixed unit tests in ocs api
Merge pull request #110 from naveenhooda2000/develop

Made activation date optional while indexing to Solr
removed stored fields for color and colorfamily in color swatches story