Followup on the 'quick hack to allow use of a local file, added specifically for vagrant users'#1

subhobroto wants to merge 2 commits intobryanwb:masterbryanwb/java:masterfrom

subhobroto:mastersubhobroto/java:masterCopy head branch name to clipboard