Alignment with RF 4.3.5, WFK 2.5 and License Header 2014

Realize that besides the License header, there were some files that referenced WFK 2.4 and RF 4.3.4