Merge "added cors support into nova controller"