Merge pull request #239 from mancdaz/master

Merged automatically by jenkins after successful build test
ENHANCEMENT: Default to Folsom
Merge pull request #240 from rackerjoe/work

Merged automatically by jenkins after successful build test
Merge pull request #241 from mancdaz/master

Merged automatically by jenkins after successful build test
Fix Apiary I-06615
Merge pull request #242 from rackerjoe/I-06615

Merged automatically by jenkins after successful build test
add config options for novncproxy