QSTools Violations fixes

New PR for the QSTools violations fixes. Includes the bpel dir flattening commit, as it would be a pain to merge them separately. 

This PR is rebased on Doug's latest changes.

Here's an un-squashed version to assist reviewing: https://github.com/paulrobinson/quickstarts/tree/fix_QSTools_violations_2