cleaning k20 projects
Fix to SConscript from Jorge Henriques.
Merge remote-tracking branch 'upstream/develop' into develop-fixes