Correct mode of /var/log/crowbar for use in nfs mounting sledgehammer log files
Fixes - DE1167 - UI group status not updated correctly.
Fixes - DE1167 - UI group status not updated correctly.
Merge pull request #725 from waynepallen/pull-req-release-roxy-master-6b43a039cee56aa82dc10472f6e5a936e22c9031

Correct mode of /var/log/crowbar for use in nfs mounting sledgehammer log files [1/1]
DE1362 - Alias name (+ ChefObject.cloud_domain.length) cannot exceed 63 chars.

Conflicts:

	crowbar_framework/app/models/node_object.rb
Merge from Mesa 1.6 - DE1226 - UI for all barclamps, fix problem with arrows incorrectly displaying closed when they should be open.
DE1362: Alias name not allowed to be longer than 63 and combination of alias and host cannot exceed 254 chars.  Fix for fix.

Conflicts:

	crowbar_framework/app/models/node_object.rb
Merge pull request #731 from dpaterson/pull-req-release-roxy-master-b3649a5bb2f81f15a6ea5824a0d783fad3f6dcb9

Merge from Mesa 1.6- DE1226 - UI for all barclamps, fix problem with arrows incorrectly displaying closed when they should be open AND Fixes- DE1167-UI group status not updated correctly AND DE1352-Hardware Update button displays incorrect message [1/1]
Merge pull request #733 from jjacob512/pull-req-release-roxy-master-378aea39ae6f0b81b7cf668bd5c695a486c1e21c

merging batch of fixes from mesa-1.6 to roxy [1/1]
doc updates
Merged mesa 1.6.1 document changes
Merge pull request #735 from dpaterson/pull-req-release-roxy-master-54c3463f5b3e8b96c2fc395ea0ef89ab3b077755

Merged some small documentation changes, tempest specific. [1/1]