Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'daley', remote-tracking branch 'origin'
Revert "Merge branch 'xsd-updates' of https://github.com/RackerWilliams/repose into daley"

This reverts commit ef4665c2f55c817e96fda8e89fb67fdd52263aa5, reversing
changes made to bb92222241469cae0ff18394aa130a8249663eec.
Merge branch 'daley', remote-tracking branch 'origin'
Cleanups on contaner config XSD.
Add xslt to build step to remove XSD 1.1 elements from config XSDs in core