BZ-12697 Create Portfolio Form: Update text
Merge branch 'master' into PM2Way
BZ-12698: Create Portfolio Success Dialog: Add option to Integrate with Energy Star
Merge branch 'master' into PM2Way
BZ-12702: Portfolio List & Details Update text & icons for Energy Star Time & status
Merge branch 'master' into PM2Way

Conflicts:
	src/main/js/noesis/bootstrap/portfolio/templates/createPortfolio.html
BZ-12702: Portfolio List & Details Update text & icons for Energy Star Time & status
Merge branch 'master' into PM2Way
Merge branch 'PM2Way'