Merge pull request #1077 from dell/usr/chronarchitect/OME45_ome_template