KFSTP-1256 Pulling in some files that did not get synched with SVN