Fix for constant recompile issue.
Merge bzr://10.0.3.21 Build: jenkins-Gearmand-1018
Merge bzr://10.0.3.21/ Build: jenkins-Gearmand-1026