fix While and add inspect log files via command as prep for doing CLI tests
added private role, add by default
remove barclampattrib and repurpose jig_map
refactoring milestone: barclamp connected to attrib and role with mapping to barclamp.  unit tests passing
resolve merge fixes for Travis
bdd tests passing
fix tests based on attrib state changes to ready
resolve merge conflict - template.save moved
resolve merge conflicts
fix permissions
catch missing items from migration
Merge remote-tracking branch 'crowbar/master'
check point - resolving test issues
all tests passing
really really fix it this time
Merge pull request #376 from cloudedge/pull-req-master-d5070acd86c8ba863774a27e016b5327e7e0e41e

Merged by devtool for aabes