Added source code builds to second layer Dockerfile.
Merge branch 'build-streamlining'