Changes and updates ported from cfgov-refresh.
Updates needed for cf-core.
Merge pull request #1 from himedlooff/master

Changes and updates ported from cfgov-refresh.