BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
Merge branch 'RC20140807' into integration