Code cleanup
Upgrade artifact dependencies
Allow VM parameters to override context configuration