Merge remote-tracking branch 'remotes/origin/competitive-estimates' into Competitive_Estimates-Create

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neFinancing.html
BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
Merge branch 'Competitive_Estimates-Create' into integration

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neFinancing.html