Solving system env/content view timing issue
Changing content views source for select on system form
Merge pull request #2076 from daviddavis/temp_1366896708

Solving system env/content view timing issue
Merge pull request #2078 from daviddavis/temp_1366904573

Changing content views source for select on system form