Experimental changes to remove promises
Merge branch 'master' into story/REMOVE_PROMISES
More removal of code that uses promises
Merge branch 'master' into story/REMOVE_PROMISES
More updates
Updates to more services to remove promises
Merge branch 'master' into story/REMOVE_PROMISES
Removed more promise code
Merge branch 'master' into story/REMOVE_PROMISES
More updates to remove calls to deprecated functions
Merge branch 'master' into story/REMOVE_PROMISES
More refactoring to remove promises
Merge branch 'master' into story/REMOVE_PROMISES
Merge branch 'master' into story/REMOVE_PROMISES
Remove promises from portfolio code
Merge branch 'master' into story/REMOVE_PROMISES
Cleanup from botched updates.  Removed test code.  It was broken and served no purpose.
Merge branch 'master' into story/REMOVE_PROMISES
Bug Fixes from code review
Update from code review.  Fixed undefined variable