Merge pull request #370 from cloudedge/pull-req-master-9613cfb08bb606d5fd1dd14d67b9ed03202a05dd

AttribInstance refactoring checkpoint added RoleInstance (all tests passing) [1/1]
Fix Ruby 1.9 test failures

These were introduced in the following commit:

  commit 337c313171114b57a1fd91905c06ef44080f236f
  Author: Rob Hirschfeld <rob_hirschfeld@dell.com>
  Date:   Sat Jan 26 03:21:51 2013 -0800

      attrib cleanups before moving jig data parse
resolve merge fixes for Travis
bdd tests passing
fix tests based on attrib state changes to ready